From dc0a1b7fd5fd7434005aed0a552f40f9eb1b2316 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 8 Jul 2015 14:01:30 +0200
Subject: [PATCH 001/216] New : add shortcut to create a credit note from the
 concerned bill

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

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 65529079d39..a5f7f1e004d 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2073,7 +2073,7 @@ if ($action == 'create')
 		$newinvoice_static->paye = $valarray ['paye'];
 
 		$optionsav .= '<option value="' . $key . '"';
-		if ($key == $_POST['fac_avoir'])
+		if ($key == GETPOST('fac_avoir'))
 			$optionsav .= ' selected';
 		$optionsav .= '>';
 		$optionsav .= $newinvoice_static->ref;
@@ -3728,6 +3728,15 @@ else if ($id > 0 || ! empty($ref))
 					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>';
 				}
 			}
+			
+			// Create a credit note
+			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $user->rights->facture->creer)
+			{
+				if (! $objectidnext)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?socid=' . $object->socid .'&amp;fac_avoir=' . $object->id . '&amp;action=create&amp;type=2">' . $langs->trans("CreateCreditNote") . '</a></div>';
+				}
+			}
 
 			//Create next situation invoice
 			if ($user->rights->facture->creer && ($object->type == 5) && ($object->statut == 1 || $object->statut == 2)) {

From b8b337ff5236d87f7672831f87129b44bf161db5 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 8 Jul 2015 14:28:40 +0200
Subject: [PATCH 002/216] Translation

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

diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 4f1512a431d..de267cdcbf4 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -88,6 +88,7 @@ ClassifyCanceled=Classify 'Abandoned'
 ClassifyClosed=Classify 'Closed'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Create Invoice
+CreateCreditNote=Create credit note
 AddBill=Create invoice or credit note
 AddToDraftInvoices=Add to draft invoice
 DeleteBill=Delete invoice

From 9f9ba12802f2fe132772ff867665457bff8c5a28 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Wed, 8 Jul 2015 14:32:57 +0200
Subject: [PATCH 003/216] New : option to allow credit note without related
 invoice

---
 htdocs/admin/facture.php                      | 60 ++++++++++++++-----
 htdocs/compta/facture.php                     |  7 ++-
 .../modules/facture/doc/pdf_crabe.modules.php |  2 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 4 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index e993d2c276c..d03dbc1f568 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -280,6 +280,24 @@ if ($action == 'set_FAC_AUTO_FILLJS')
 	}
 }
 
+if ($action == 'set_INVOICE_CREDIT_NOTE_STANDALONE')
+{
+	$freetext = GETPOST('INVOICE_CREDIT_NOTE_STANDALONE');	// No alpha here, we want exact string
+
+	$res = dolibarr_set_const($db, "INVOICE_CREDIT_NOTE_STANDALONE",$freetext,'chaine',0,'',$conf->entity);
+
+	if (! $res > 0) $error++;
+
+	if (! $error)
+	{
+		setEventMessage($langs->trans("SetupSaved"));
+	}
+	else
+	{
+		setEventMessage($langs->trans("Error"),'errors');
+	}
+}
+
 
 /*
  * View
@@ -750,6 +768,34 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
+// Add js auto fill amount on paiement 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_FAC_AUTO_FILLJS" />';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("JSOnPaimentBill");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("FAC_AUTO_FILLJS",$conf->global->FAC_AUTO_FILLJS,1);
+print '</td><td align="right">';
+print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
+print "</td></tr>\n";
+print '</form>';
+
+// Allow to create credit note not related to an invoice
+$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_CREDIT_NOTE_STANDALONE" />';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("AllowCreditNoteWithoutRelatedInvoice");
+print '</td><td width="60" align="center">';
+print $form->selectyesno("INVOICE_CREDIT_NOTE_STANDALONE",$conf->global->INVOICE_CREDIT_NOTE_STANDALONE,1);
+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'].'" />';
@@ -774,20 +820,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
-// Add js auto fill amount on paiement 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_FAC_AUTO_FILLJS" />';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("JSOnPaimentBill");
-print '</td><td width="60" align="center">';
-print $form->selectyesno("FAC_AUTO_FILLJS",$conf->global->FAC_AUTO_FILLJS,1);
-print '</td><td align="right">';
-print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" />';
-print "</td></tr>\n";
-print '</form>';
-
 print '</table>';
 
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index a5f7f1e004d..37812dbf413 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -706,7 +706,8 @@ if (empty($reshook))
 		// Credit note invoice
 		if ($_POST['type'] == Facture::TYPE_CREDIT_NOTE)
 		{
-			if (! ($_POST['fac_avoir'] > 0))
+			$sourceinvoice = GETPOST('fac_avoir');
+			if (! ($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
 			{
 				$error ++;
 				setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), 'errors');
@@ -739,7 +740,7 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 
 				// Proprietes particulieres a facture avoir
-				$object->fk_facture_source = $_POST['fac_avoir'];
+				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
 				$object->type = Facture::TYPE_CREDIT_NOTE;
 
 				$id = $object->create($user);
@@ -2878,7 +2879,7 @@ else if ($id > 0 || ! empty($ref))
 		$facreplaced->fetch($object->fk_facture_source);
 		print ' (' . $langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)) . ')';
 	}
-	if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+	if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
 		$facusing = new Facture($db);
 		$facusing->fetch($object->fk_facture_source);
 		print ' (' . $langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)) . ')';
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index aa9fbf65ed2..74d73d5d497 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1500,7 +1500,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0,0,60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
-		if ($object->type == 2)
+		if ($object->type == 2 && !empty($object->fk_facture_source))
 		{
 			$objectreplaced=new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3bf2d5a14b5..bf1010f767b 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1165,6 +1165,7 @@ CreditNotePDFModules=Credit note document models
 CreditNote=Credit note
 CreditNotes=Credit notes
 ForceInvoiceDate=Force invoice date to validation date
+AllowCreditNoteWithoutRelatedInvoice=Allow to create credit note without a related invoice
 DisableRepeatable=Disable repeatable invoices
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment

From b222800012bbdb5ff0c8329d10fea991aa35f77b Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 23 Sep 2015 15:14:08 +0200
Subject: [PATCH 004/216] FIX clone customer order create new order with
 validate ref and not with PROV

---
 htdocs/commande/class/commande.class.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 767bf294d6f..567c3f1a702 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -988,14 +988,16 @@ class Commande extends CommonOrder
         $this->ref_client         = '';
 
         // Set ref
-        require_once DOL_DOCUMENT_ROOT ."/core/modules/commande/".$conf->global->COMMANDE_ADDON.'.php';
-        $obj = $conf->global->COMMANDE_ADDON;
-        $modCommande = new $obj;
-        $this->ref = $modCommande->getNextValue($objsoc,$this);
-
+		$this->ref = '(PROV)';
 
         // Create clone
         $result=$this->create($user);
+        if ($result < 0) $error++;
+
+		// Set new ref
+		$newref='(PROV'.$this->id.')';
+        $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($newref)."' WHERE rowid=".$this->id;
+        $result=$this->db->query($sql);
         if ($result < 0) $error++;
 
         if (! $error)

From f3ef9b868f9c4a25189479cc6fe21e0ebfaee39d Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Mon, 5 Oct 2015 16:19:54 +0200
Subject: [PATCH 005/216] fix entities warehouse share

---
 htdocs/product/class/product.class.php        | 2 +-
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index e6695b75bc6..9d409e73c32 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2662,7 +2662,7 @@ class Product extends CommonObject
 		$sql = "SELECT ps.reel, ps.fk_entrepot, ps.pmp";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."entrepot as w";
-		$sql.= " WHERE w.entity IN (".getEntity('warehouse', 1).")";
+		$sql.= " WHERE w.entity IN (".getEntity('stock', 1).")";
 		$sql.= " AND w.rowid = ps.fk_entrepot";
 		$sql.= " AND ps.fk_product = ".$this->id;
 
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 384b3712674..1056829838b 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -358,7 +358,7 @@ class Entrepot extends CommonObject
 
 		$sql = "SELECT rowid, label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."entrepot";
-		$sql.= " WHERE entity IN (".getEntity('warehouse', 1).")";
+		$sql.= " WHERE entity IN (".getEntity('stock', 1).")";
 		$sql.= " AND statut = ".$status;
 
 		$result = $this->db->query($sql);

From 00f0aff6f0cead68aa186b5c704b564b27d04ed2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 8 Oct 2015 15:58:19 +0200
Subject: [PATCH 006/216] FIX: change order date on clone (as everywhere else)

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 7a8fd63c8f1..cdb753698a4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -881,6 +881,7 @@ class Commande extends CommonOrder
         // Clear fields
         $this->user_author_id     = $user->id;
         $this->user_valid         = '';
+        $this->date				  = dol_now();
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_client         = '';

From 6f4cfc86e8e82b98092775113e9d4f1c79560103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sun, 18 Oct 2015 11:25:55 +0200
Subject: [PATCH 007/216] Update notify.class.php

http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
---
 htdocs/core/class/notify.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index b0d4b4e2690..0dbd47727fb 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -143,7 +143,7 @@ class Notify
      */
     function send($action, $object)
     {
-        global $conf,$langs,$mysoc,$dolibarr_main_url_root;
+        global $user,$conf,$langs,$mysoc,$dolibarr_main_url_root;
 
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 

From e7e152c122873c46143d06dc64bf4ff21802b534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 19 Oct 2015 15:13:19 +0200
Subject: [PATCH 008/216] NEW Level multiprice generator based on per cent
 variations over base price

---
 htdocs/core/lib/product.lib.php               |  10 +
 .../install/mysql/migration/3.8.0-3.9.0.sql   |   9 +
 htdocs/install/mysql/tables/llx_product.sql   |   5 +-
 .../tables/llx_product_pricerules.key.sql     |  19 ++
 .../mysql/tables/llx_product_pricerules.sql   |  26 +++
 htdocs/langs/en_US/errors.lang                |   1 +
 htdocs/langs/en_US/products.lang              |   4 +
 htdocs/product/admin/price_rules.php          | 196 ++++++++++++++++++
 htdocs/product/class/product.class.php        |  79 ++++++-
 htdocs/product/price.php                      | 108 ++++++----
 10 files changed, 411 insertions(+), 46 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_product_pricerules.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_product_pricerules.sql
 create mode 100644 htdocs/product/admin/price_rules.php

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index ff2e9c14dbe..8357f7a65ac 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -3,6 +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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -166,6 +167,15 @@ function product_admin_prepare_head()
 	$head[$h][2] = 'general';
 	$h++;
 
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+		$head[$h] = array(
+			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
+			1 => $langs->trans('MultipriceRules'),
+			2 => 'generator'
+		);
+		$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/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index a06736d3ce4..d9361cef4b6 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -67,6 +67,14 @@ ALTER TABLE llx_prelevement_lignes MODIFY COLUMN code_banque varchar(128);
 ALTER TABLE llx_societe_rib MODIFY COLUMN code_banque varchar(128);
 
 ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30);
+CREATE TABLE llx_product_pricerules
+(
+    rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    level INT NOT NULL, -- Which price level is this rule for?
+    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
+);
 
 
 ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(10000);
@@ -94,3 +102,4 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath);
 
 
 ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy;
+ALTER TABLE llx_product ADD COLUMN price_autogen TINYINT(1) DEFAULT 0;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 42832a6b227..b5df0ade60c 100755
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -46,7 +46,7 @@ create table llx_product
   price_base_type			varchar(3)   DEFAULT 'HT',
   tva_tx					double(6,3),					  -- Default VAT rate of product
   recuperableonly           integer NOT NULL DEFAULT '0',  -- French NPR VAT
-  localtax1_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 1 
+  localtax1_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 1
   localtax2_tx				double(6,3)  DEFAULT 0,         -- Spanish local VAT 2
   fk_user_author			integer DEFAULT NULL,			  -- user making creation
   fk_user_modif             integer,                         -- user making last change
@@ -81,5 +81,6 @@ create table llx_product
   import_key				varchar(14),					-- Import key
   fk_price_expression integer,                     -- Link to the rule for dynamic price calculation
   desiredstock              integer      DEFAULT 0,
-  fk_unit					integer      DEFAULT NULL
+  fk_unit					integer      DEFAULT NULL,
+  price_autogen TINYINT DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.key.sql b/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
new file mode 100644
index 00000000000..42b9289d26a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
@@ -0,0 +1,19 @@
+-- ============================================================================
+-- 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/>.
+--
+-- ===========================================================================
+
+ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
\ 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
new file mode 100644
index 00000000000..3e3dfc02ed1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.sql
@@ -0,0 +1,26 @@
+-- ============================================================================
+-- 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/>.
+--
+-- ===========================================================================
+
+CREATE TABLE llx_product_pricerules
+(
+    rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    level INT NOT NULL, -- Which price level is this rule for?
+    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
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 6bf95ebe75b..858e76af447 100755
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -173,6 +173,7 @@ ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorSavingChanges=An error has ocurred when saving the changes
 
 # 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/products.lang b/htdocs/langs/en_US/products.lang
index 6dcf4ce60f9..957fe0640ad 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -232,6 +232,10 @@ PriceByQuantityRange=Quantity range
 ProductsDashboard=Products/Services summary
 UpdateOriginalProductLabel=Modify original label
 HelpUpdateOriginalProductLabel=Allows to edit the name of the product
+MultipriceRules=Price level rules
+UseMultipriceRules=Use price level rules
+PercentVariationOver=%% variation over %s
+PercentDiscountOver=%% discount over %s
 ### composition fabrication
 Building=Production and items dispatchment
 Build=Produce
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
new file mode 100644
index 00000000000..d6d494cd61d
--- /dev/null
+++ b/htdocs/product/admin/price_rules.php
@@ -0,0 +1,196 @@
+<?php
+
+/*
+ * 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/>.
+ */
+
+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();
+
+/**
+ * Actions
+ */
+
+if ($_POST) {
+
+	$var_percent = GETPOST('var_percent', 'array');
+	$var_min_percent = GETPOST('var_min_percent', 'array');
+	$fk_level = GETPOST('fk_level', 'array');
+
+	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+
+		$check = isset($var_min_percent[$i]);
+
+		if ($i != 1) {
+			$check = $check && isset($var_percent[$i]) && isset($fk_level[$i]);
+		}
+
+		if (!$check) {
+			continue;
+		}
+
+		if ($i != 1) {
+			$i_var_percent = (float) price2num($var_percent[$i]);
+		} else {
+			$i_var_percent = 0;
+		}
+
+		$i_var_min_percent = (float) price2num($var_min_percent[$i]);
+		$i_fk_level = (int) $fk_level[$i];
+
+		if ($i == 1) {
+			$check1 = true;
+			$check2 = $i_var_min_percent;
+		} else {
+			$check1 = $i_fk_level >= 1 && $i_fk_level <= $conf->global->PRODUIT_MULTIPRICES_LIMIT;
+			$check2 = $i_var_percent && $i_var_min_percent;
+		}
+
+		if (!$check1 || !$check2) {
+
+			//If the level is between range but percent fields are empty, then we ensure it does not exist in DB
+			if ($check1 && !$check2) {
+				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int)$i);
+			}
+
+			continue;
+		}
+
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules
+		SET level = ".(int) $i.", fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent;
+
+		if (!$db->query($sql)) {
+
+			//If we could not create, then we try updating
+			$sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules
+			SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i;
+
+			if (!$db->query($sql)) {
+				setEventMessage($langs->trans('ErrorSavingChanges'), 'errors');
+			}
+		}
+
+	}
+
+	setEventMessage($langs->trans("RecordSaved"));
+}
+
+/*
+ * View
+ */
+
+$sql = "SELECT * FROM ".MAIN_DB_PREFIX."product_pricerules";
+$query = $db->query($sql);
+
+$rules = array();
+
+while ($result = $db->fetch_object($query)) {
+	$rules[$result->level] = $result;
+}
+
+$title = $langs->trans('ProductServiceSetup');
+$tab = $langs->trans("ProductsAndServices");
+
+if (empty($conf->produit->enabled)) {
+	$title = $langs->trans('ServiceSetup');
+	$tab = $langs->trans('Services');
+} elseif (empty($conf->service->enabled)) {
+	$title = $langs->trans('ProductSetup');
+	$tab = $langs->trans('Products');
+}
+
+llxHeader('', $langs->trans('MultipriceRules'));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($title,$linkback,'title_setup');
+
+$head = product_admin_prepare_head();
+dol_fiche_head($head, 'generator', $tab, 0, 'product');
+
+print load_fiche_titre($langs->trans('MultipriceRules'));
+
+//Array that contains the number of prices available
+$price_options = array();
+
+for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+	$price_options[$i] = $langs->trans('SellingPrice').' '.$i;
+}
+
+$genPriceOptions = function($level) use ($price_options) {
+
+	$return = array();
+
+	for ($i = 1; $i < $level; $i++) {
+		$return[$i] = $price_options[$i];
+	}
+
+	return $return;
+};
+
+?>
+
+<form method="post">
+
+	<table class="noborder">
+		<tr class="liste_titre">
+			<td style="text-align: center"><?php echo $langs->trans('PriceLevel') ?></td>
+			<td style="text-align: center"><?php echo $langs->trans('Price') ?></td>
+			<td style="text-align: center"><?php echo $langs->trans('MinPrice') ?></td></tr>
+		<tr>
+			<td class="fieldrequired" style="text-align: center"><?php echo $langs->trans('SellingPrice') ?> 1</td>
+			<td></td>
+			<td style="text-align: center"><input type="text"  style="text-align: right" name="var_min_percent[1]" size="5" value="<?php echo isset($rules[1]) ? price($rules[1]->var_min_percent, 2) : '' ?>"> <?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' 1') ?></td>
+		</tr>
+		<?php for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++): ?>
+			<tr>
+				<td class="fieldrequired" style="text-align: center"><?php
+					echo $langs->trans('SellingPrice').' '.$i;
+					// Label of price
+					if (! empty($conf->global->{"PRODUIT_MULTIPRICES_LABEL$i"})) {
+						print ' - '.$langs->trans($conf->global->$keyforlabel);
+					}
+					?>
+					</td>
+				<td style="text-align: center">
+					<input type="text" style="text-align: right" name="var_percent[<?php echo $i ?>]" size="5" value="<?php echo isset($rules[$i]) ? price($rules[$i]->var_percent, 2) : '' ?>">
+					<?php echo $langs->trans('PercentVariationOver', Form::selectarray("fk_level[$i]", $genPriceOptions($i), (isset($rules[$i]) ? $rules[$i]->fk_level : null))) ?>
+				</td>
+				<td style="text-align: center">
+					<input type="text" style="text-align: right" name="var_min_percent[<?php echo $i ?>]" size="5" value="<?php echo isset($rules[$i]) ? price($rules[$i]->var_min_percent, 2) : '' ?>">
+					<?php echo $langs->trans('PercentDiscountOver', $langs->trans('SellingPrice').' '.$i) ?>
+				</td>
+			</tr>
+		<?php endfor ?>
+	</table>
+
+	<br>
+
+	<div style="text-align: center">
+		<input type="submit" value="<?php echo $langs->trans('Save') ?>" class="button">
+	</div>
+</form>
+
+<?php
+
+llxFooter();
\ No newline at end of file
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6860d496561..9b959517ce5 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -191,6 +191,12 @@ class Product extends CommonObject
 	 */
 	public $fk_unit;
 
+	/**
+	 * Price is generated using multiprice rules
+	 * @var int
+	 */
+	public $price_autogen = 0;
+
 	/**
 	 * Regular product
 	 */
@@ -710,6 +716,7 @@ class Product extends CommonObject
 			$sql.= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell)."'";
 			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
 	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
+	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
 			$sql.= " WHERE rowid = " . $id;
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -1337,9 +1344,10 @@ class Product extends CommonObject
 	 *  @param		int		$level			0=standard, >0 = level if multilevel prices
 	 *  @param     	int		$newnpr         0=Standard vat rate, 1=Special vat rate for French NPR VAT
 	 *  @param     	int		$newpsq         1 if it has price by quantity
+	 * @param int $ignore_autogen Used to avoid infinite loops
 	 * 	@return		int						<0 if KO, >0 if OK
 	 */
-	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0)
+	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen = 0)
 	{
 		global $conf,$langs;
 
@@ -1353,6 +1361,12 @@ class Product extends CommonObject
 
 		// Check parameters
 		if ($newvat == '') $newvat=$this->tva_tx;
+
+		//If multiprices are enabled, then we check if the current product is subject to price autogeneration
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen) {
+			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpsq);
+		}
+
 		if (! empty($newminprice) && ($newminprice > $newprice))
 		{
 			$this->error='ErrorPriceCantBeLowerThanMinPrice';
@@ -1531,7 +1545,7 @@ class Product extends CommonObject
 		$sql.= " weight, weight_units, length, length_units, 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";
+		$sql.= " , fk_price_expression, price_autogen";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product";
 		if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id);
 		else
@@ -1608,6 +1622,7 @@ class Product extends CommonObject
 				$this->ref_ext					= $obj->ref_ext;
 				$this->fk_price_expression		= $obj->fk_price_expression;
 				$this->fk_unit					= $obj->fk_unit;
+				$this->price_autogen			= $obj->price_autogen;
 
 				$this->db->free($resql);
 
@@ -3992,4 +4007,64 @@ class Product extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Generates prices for a product based on product multiprice generation rules
+	 *
+	 * @param User $user User that updates the prices
+	 * @param float $baseprice Base price
+	 * @param string $price_type Base price type
+	 * @param float $price_vat VAT % tax
+	 * @param int $npr NPR
+	 * @param string $psq ¿?
+	 * @return int -1 KO, 1 OK
+	 */
+	public function generateMultiprices(User $user, $baseprice, $price_type, $price_vat, $npr, $psq)
+	{
+		global $conf, $db;
+
+		$sql = "SELECT * FROM ".MAIN_DB_PREFIX."product_pricerules";
+		$query = $db->query($sql);
+
+		$rules = array();
+
+		while ($result = $db->fetch_object($query)) {
+			$rules[$result->level] = $result;
+		}
+
+		//Because prices can be based on other level's prices, we temporarily store them
+		$prices = array(
+			1 => $baseprice
+		);
+
+		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
+
+			$price = $baseprice;
+			$price_min = 0;
+
+			if ($i > 1) {
+				//We have to make sure it does exist and it is > 0
+				if (isset($rules[$i]->var_percent) && $rules[$i]->var_percent) {
+					$price = $prices[$rules[$i]->fk_level] * (1 + ($rules[$i]->var_percent/100));
+				}
+			}
+
+			$prices[$i] = $price;
+
+			//We have to make sure it does exist and it is > 0
+			if (isset($rules[$i]->var_min_percent) && $rules[$i]->var_min_percent) {
+				$price_min = $price * (1 - ($rules[$i]->var_min_percent/100));
+			}
+
+			if ($price == $this->multiprices[$i] && ($price_min == $this->multiprices_min[$i])) {
+				continue;
+			}
+
+			if ($this->updatePrice($price, $price_type, $user, $price_vat, $price_min, $i, $npr, $psq, true) < 0) {
+				return -1;
+			}
+		}
+
+		return 1;
+	}
 }
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 9c7defc4643..27d00db18f2 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -82,39 +82,37 @@ $parameters=array('id'=>$id, 'ref'=>$ref);
 $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 == 'update_price' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
-	{
+if (empty($reshook)) {
+	if ($action == 'update_price' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$newprice = '';
+		$newprice_min = '';
+		$newpricebase = '';
+		$newvat = '';
+
 		$maxpricesupplier = $object->min_recommended_price();
 		$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
 		// MultiPrix
-		if (! empty($conf->global->PRODUIT_MULTIPRICES))
-		{
-			$newprice = '';
-			$newprice_min = '';
-			$newpricebase = '';
-			$newvat = '';
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
-			{
-				if (isset($_POST ["price_" . $i]))
-				{
+			//Shall we generate prices using price rules?
+			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
+			$object->update($object->id, $user);
+
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
+				if (isset($_POST ["price_".$i])) {
 					$level = $i;
-					$newprice = price2num($_POST ["price_" . $i], 'MU');
-					$newprice_min = price2num($_POST ["price_min_" . $i], 'MU');
-					$newpricebase = $_POST ["multiprices_base_type_" . $i];
-					$newnpr = (preg_match('/\*/', $_POST ["tva_tx_" . $i]) ? 1 : 0);
-					$newvat = str_replace('*', '', $_POST ["tva_tx_" . $i]);
+					$newprice = price2num($_POST ["price_".$i], 'MU');
+					$newprice_min = price2num($_POST ["price_min_".$i], 'MU');
+					$newpricebase = $_POST ["multiprices_base_type_".$i];
+					$newnpr = (preg_match('/\*/', $_POST ["tva_tx_".$i]) ? 1 : 0);
+					$newvat = str_replace('*', '', $_POST ["tva_tx_".$i]);
 					$newpsq = GETPOST('psqflag');
 					$newpsq = empty($newpsq) ? 0 : $newpsq;
 					break; // We found submited price
 				}
 			}
-		}
-		else
-		{
+		} else {
 			$level = 0;
 			$newprice = price2num($_POST ["price"], 'MU');
 			$newprice_min = price2num($_POST ["price_min"], 'MU');
@@ -125,42 +123,39 @@ if (empty($reshook))
 			$newpsq = empty($newpsq) ? 0 : $newpsq;
 		}
 
-		if (! empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier)
-		{
-			setEventMessage($langs->trans("MinimumPriceLimit",price($maxpricesupplier,0,'',1,-1,-1,'auto')),'errors');
-			$error++;
-			$action='edit_price';
+		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
+			setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors');
+			$error ++;
+			$action = 'edit_price';
 		}
 
-		if ($newprice < $newprice_min && ! empty($object->fk_price_expression))
-		{
+		if ($newprice < $newprice_min && !empty($object->fk_price_expression)) {
 			$newprice = $newprice_min; //Set price same as min, the user will not see the
 		}
 
-		if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0)
-		{
+		$res = $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);
+
+		if ($res) {
+
 			if ($object->fk_price_expression != 0) {
 				//Check the expression validity by parsing it
 				$priceparser = new PriceParser($db);
 				$price_result = $priceparser->parseProduct($object);
 				if ($price_result < 0) { //Expression is not valid
-					$error++;
-					$action='edit_price';
+					$error ++;
+					$action = 'edit_price';
 					setEventMessage($priceparser->translatedError(), 'errors');
 				}
 			}
-			if (empty($error) && ! empty($conf->dynamicprices->enabled))
-			{
-				$ret=$object->setPriceExpression($object->fk_price_expression);
-				if ($ret < 0)
-				{
-					$error++;
-					$action='edit_price';
+			if (empty($error) && !empty($conf->dynamicprices->enabled)) {
+				$ret = $object->setPriceExpression($object->fk_price_expression);
+				if ($ret < 0) {
+					$error ++;
+					$action = 'edit_price';
 					setEventMessage($object->error, 'errors');
 				}
 			}
-			if (empty($error))
-			{
+			if (empty($error)) {
 				$action = '';
 				setEventMessage($langs->trans("RecordSaved"));
 			}
@@ -170,6 +165,7 @@ if (empty($reshook))
 		}
 	}
 
+
 	if ($action == 'delete' && $user->rights->produit->supprimer)
 	{
 		$result = $object->log_price_delete($user, $_GET ["lineid"]);
@@ -785,6 +781,33 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 	}
 	else
 	{
+
+		?>
+		<script>
+
+			var showHidePriceRules = function () {
+				var otherPrices = $('div.fiche form:not(:first)');
+				var minPrice1 = $('div.fiche form:first tr:eq(3)');
+
+				console.log('e');
+
+				if (jQuery('input#usePriceRules').prop('checked')) {
+					otherPrices.hide();
+					minPrice1.hide();
+				} else {
+					otherPrices.show();
+					minPrice1.show();
+				}
+			};
+
+			jQuery(document).ready(function () {
+				showHidePriceRules();
+
+				jQuery('input#usePriceRules').click(showHidePriceRules);
+			});
+		</script>
+		<?php
+
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
@@ -798,6 +821,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 
 			// VAT
 			if ($i == 1) {
+				print '<tr><td>' . $langs->trans('UseMultipriceRules'). '</td><td><input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'></td></tr>';
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
 				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx ["$i"], $mysoc, '', $object->id);
 				print '</td></tr>';

From 6db09a0d649a0bbc6fc3b072fc747a3873700976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 20 Oct 2015 11:35:49 +0200
Subject: [PATCH 009/216] Little correction

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9b959517ce5..f5e95ff0e93 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1363,7 +1363,8 @@ class Product extends CommonObject
 		if ($newvat == '') $newvat=$this->tva_tx;
 
 		//If multiprices are enabled, then we check if the current product is subject to price autogeneration
-		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen) {
+		//Price will be modified ONLY when the first one is the one that is being modified
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpsq);
 		}
 

From 1b10612c4bee864b25b94991c0a631c172d23957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 20 Oct 2015 11:41:33 +0200
Subject: [PATCH 010/216] Fixed PHPCS check

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

diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index d6d494cd61d..76b907e14d4 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -71,7 +71,7 @@ if ($_POST) {
 
 			//If the level is between range but percent fields are empty, then we ensure it does not exist in DB
 			if ($check1 && !$check2) {
-				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int)$i);
+				$db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int) $i);
 			}
 
 			continue;

From c6baeacd3d6560e6d3c6f38bff6621839bba022d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Tue, 20 Oct 2015 11:42:56 +0200
Subject: [PATCH 011/216] Removed JS debugging

---
 htdocs/product/price.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 27d00db18f2..7eb9ee0b7e8 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -789,8 +789,6 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 				var otherPrices = $('div.fiche form:not(:first)');
 				var minPrice1 = $('div.fiche form:first tr:eq(3)');
 
-				console.log('e');
-
 				if (jQuery('input#usePriceRules').prop('checked')) {
 					otherPrices.hide();
 					minPrice1.hide();

From ca8c1adf55dc1f3ded447626064e9815d8856306 Mon Sep 17 00:00:00 2001
From: All-3kcis <contact@all-3kcis.fr>
Date: Wed, 21 Oct 2015 10:07:53 +0200
Subject: [PATCH 012/216] Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for
 frounisseur.product remove_product_fournisseur_price()

---
 .../fourn/class/fournisseur.product.class.php | 19 ++++++++++++++++---
 htdocs/product/fournisseurs.php               |  9 +++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 490b5cf1ea3..346f69a4cef 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -121,7 +121,7 @@ class ProductFournisseur extends Product
      */
     function remove_product_fournisseur_price($rowid)
     {
-        global $conf;
+        global $conf, $user;
 
         $this->db->begin();
 
@@ -132,8 +132,21 @@ class ProductFournisseur extends Product
         $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->db->commit();
-            return 1;
+            // Call trigger
+            $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE',$user);
+            if ($result < 0) $error++;
+            // End call triggers
+
+            if (empty($error))
+            {
+                $this->db->commit();
+                return 1;
+            }
+            else
+            {
+                $this->db->rollback();
+                return -1;
+            }
         }
         else
         {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 72f8ed2b0b2..526b67b123c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -95,9 +95,14 @@ if (empty($reshook))
 	{
 		if ($rowid)
 		{
-			$result=$object->remove_product_fournisseur_price($rowid);
 			$action = '';
-			setEventMessage($langs->trans("PriceRemoved"));
+			$result=$product->remove_product_fournisseur_price($rowid);
+			if($result > 0){
+				setEventMessage($langs->trans("PriceRemoved"));
+			}else{
+				$error++;
+				setEventMessages($product->error, $product->errors, 'errors');
+			}
 		}
 	}
 

From ceae04b76e243dff282cba2fdd4b68990e933454 Mon Sep 17 00:00:00 2001
From: All-3kcis <contact@all-3kcis.fr>
Date: Thu, 22 Oct 2015 12:03:01 +0200
Subject: [PATCH 013/216] move trigger before query

---
 .../fourn/class/fournisseur.product.class.php | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 346f69a4cef..c143e2e98be 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -123,35 +123,34 @@ class ProductFournisseur extends Product
     {
         global $conf, $user;
 
-        $this->db->begin();
+        // Call trigger
+        $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE',$user);
+        if ($result < 0) $error++;
+        // End call triggers
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
-        $sql.= " WHERE rowid = ".$rowid;
-
-        dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
+        if (empty($error))
         {
-            // Call trigger
-            $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE',$user);
-            if ($result < 0) $error++;
-            // End call triggers
+            $this->db->begin();
 
-            if (empty($error))
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
+            $sql.= " WHERE rowid = ".$rowid;
+
+            dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
+            $resql = $this->db->query($sql);
+            if ($resql)
             {
                 $this->db->commit();
                 return 1;
             }
             else
             {
+                $this->error=$this->db->lasterror();
                 $this->db->rollback();
                 return -1;
             }
         }
         else
         {
-            $this->error=$this->db->lasterror();
-            $this->db->rollback();
             return -1;
         }
     }

From 00c2b1a32a6231eb7dc371bd198ad2563bbe0baa Mon Sep 17 00:00:00 2001
From: All-3kcis <contact@all-3kcis.fr>
Date: Thu, 22 Oct 2015 14:30:11 +0200
Subject: [PATCH 014/216] move db->begin() before trigger

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

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index c143e2e98be..acbeba8a720 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -123,6 +123,8 @@ class ProductFournisseur extends Product
     {
         global $conf, $user;
 
+        $this->db->begin();
+
         // Call trigger
         $result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE',$user);
         if ($result < 0) $error++;
@@ -130,7 +132,6 @@ class ProductFournisseur extends Product
 
         if (empty($error))
         {
-            $this->db->begin();
 
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
             $sql.= " WHERE rowid = ".$rowid;

From 4e206fa80b3dc44ab92fa68f313dd8710b9b6efb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 19:53:59 +0100
Subject: [PATCH 015/216] Fix doxygen

---
 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 9b0ef17b465..6d802e7f567 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5134,8 +5134,8 @@ class Form
      * 		@param	int			$width			Width of photo
      * 		@param	int			$height			Height of photo (auto if 0)
      * 		@param	int			$caneditfield	Add edit fields
-     * 		@param	string		$imagesize		'mini', 'small' or '' (original)
      * 		@param	string		$cssclass		CSS name to use on img for photo
+     * 		@param	string		$imagesize		'mini', 'small' or '' (original)
      * 	  	@return string    					HTML code to output photo
      */
     static function showphoto($modulepart, $object, $width=100, $height=0, $caneditfield=0, $cssclass='photowithmargin', $imagesize='')

From 295eb533f884a3da9ec4c5476b3c2f34ead761e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 20:14:57 +0100
Subject: [PATCH 016/216] FIX Bad picto for expense report

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

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 78ca120516e..7de680d02f3 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1543,7 +1543,7 @@ class ExpenseReport extends CommonObject
 	        $response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24;
 	        $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"),"user");
+	        $response->img=img_object($langs->trans("ExpenseReports"),"trip");
 
             while ($obj=$this->db->fetch_object($resql))
             {

From 77a0359cfc13bbcd896292bc86669b5154072bdd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 25 Oct 2015 20:17:43 +0100
Subject: [PATCH 017/216] Fix bad test

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6d802e7f567..79ba773ad36 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5159,8 +5159,8 @@ class Form
             $dir=$conf->user->dir_output;
             if (! empty($object->photo))
             {
-                if ($imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
-                else if ($imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+                if ((string) $imagesize == 'mini') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+                else if ((string) $imagesize == 'small') $file=get_exdir($id, 2, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
                 else $file=get_exdir($id, 2, 0, 0, $object, 'user').$object->photo;
             }
             if (! empty($conf->global->MAIN_OLD_IMAGE_LINKS)) $altfile=$object->id.".jpg";	// For backward compatibility

From 4b7c451f3d522abf9197219509e7547ab76bd076 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Mon, 26 Oct 2015 09:43:58 +0100
Subject: [PATCH 018/216] Option of standalone creditnote is hidden

---
 htdocs/admin/facture.php | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index e136d8663fe..c870f7ed321 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -280,24 +280,6 @@ if ($action == 'set_FAC_AUTO_FILLJS')
 	}
 }
 
-if ($action == 'set_INVOICE_CREDIT_NOTE_STANDALONE')
-{
-	$freetext = GETPOST('INVOICE_CREDIT_NOTE_STANDALONE');	// No alpha here, we want exact string
-
-	$res = dolibarr_set_const($db, "INVOICE_CREDIT_NOTE_STANDALONE",$freetext,'chaine',0,'',$conf->entity);
-
-	if (! $res > 0) $error++;
-
-	if (! $error)
-	{
-		setEventMessage($langs->trans("SetupSaved"));
-	}
-	else
-	{
-		setEventMessage($langs->trans("Error"),'errors');
-	}
-}
-
 
 /*
  * View
@@ -782,20 +764,6 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'" /
 print "</td></tr>\n";
 print '</form>';
 
-// Allow to create credit note not related to an invoice
-$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_CREDIT_NOTE_STANDALONE" />';
-print '<tr '.$bc[$var].'><td>';
-print $langs->trans("AllowCreditNoteWithoutRelatedInvoice");
-print '</td><td width="60" align="center">';
-print $form->selectyesno("INVOICE_CREDIT_NOTE_STANDALONE",$conf->global->INVOICE_CREDIT_NOTE_STANDALONE,1);
-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'].'" />';

From 990fbf3ef45a06577264f7ce6630964acdc9269c Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Mon, 26 Oct 2015 14:00:43 +0100
Subject: [PATCH 019/216] hooks correctly implemented , printObjectLine,
 printObjectSubLine In hook can change correctly label and ref (for my module
 need if is posible)

---
 htdocs/core/class/commonobject.class.php | 12 ++++++++----
 htdocs/core/class/hookmanager.class.php  |  4 +++-
 htdocs/core/lib/pdf.lib.php              |  6 ++++++
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d5dac206e15..1439915ebdb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3108,20 +3108,21 @@ abstract class CommonObject
 
 			$var=!$var;
 
-			if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
+			//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.
 			{
 				if (empty($line->fk_parent_line))
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
 				else
 				{
 					$parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline);
-					$hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+                    $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
 				}
 			}
-			else
+            if (empty($reshook))
 			{
 				$this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline);
 			}
@@ -3171,6 +3172,9 @@ abstract class CommonObject
 			{
 				$product_static = new Product($this->db);
 				$product_static->fetch($line->fk_product);
+
+                $product_static->ref = $line->ref; //can change ref in hook
+                $product_static->label = $line->label; //can change label in hook
 				$text=$product_static->getNomUrl(1);
 
 				// Define output language and label
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 249a6665a3f..a23977acebe 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -163,7 +163,9 @@ class HookManager
 				'printAddress',
 				'printSearchForm',
 				'formatEvent',
-				'addCalendarChoice'
+                'addCalendarChoice',
+                'printObjectLine',
+                'printObjectSubLine'
 				)
 			)) $hooktype='addreplace';
         // Deprecated hook types ('returnvalue')
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 0d7f18e1c75..0bd13869ce8 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1088,6 +1088,12 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 	if ($idprod)
 	{
 		$prodser->fetch($idprod);
+
+        //can change ref in hook
+        if(isset($object->lines[$i]->ref)){
+        $prodser->ref = $object->lines[$i]->ref;
+        }
+
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
 		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{

From 29b8919a4000e1957defdee0039e1091aa947ca3 Mon Sep 17 00:00:00 2001
From: atm-robin <robin.jaquet@atm-consulting.fr>
Date: Mon, 26 Oct 2015 14:34:46 +0100
Subject: [PATCH 020/216] FIX supplier rights for orderToInvoice

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

diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index 083ea05bc64..b63b3d9dd1d 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -44,7 +44,7 @@ $langs->load('orders');
 $langs->load('deliveries');
 $langs->load('companies');
 
-if (! $user->rights->facture->creer)
+if (! $user->rights->fournisseur->facture->creer)
 	accessforbidden();
 
 $id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility

From fa3af485ef92c475b42ac2dc4e1ad2304c230d36 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 26 Oct 2015 18:33:22 +0100
Subject: [PATCH 021/216] FIX action not appear before an update because of a
 lack of line in action ressource

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

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index 509a9c90d77..977a91a404a 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -199,7 +199,7 @@ if ($status == 'todo') { $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (
 if ($filtert > 0 || $usergroup > 0)
 {
     $sql.= " AND (";
-    if ($filtert > 0) $sql.= "ar.fk_element = ".$filtert;
+    if ($filtert > 0) $sql.= "(ar.fk_element = ".$filtert." OR a.fk_user_action=".$filtert.")";
     if ($usergroup > 0) $sql.= ($filtert>0?" OR ":"")." ugu.fk_usergroup = ".$usergroup;
     $sql.= ")";
 }

From 4d839eea60310811254b0dcf708a7259d55b2822 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 26 Oct 2015 20:33:42 +0100
Subject: [PATCH 022/216] Fix #2591 Margin is incorrect used with POS

if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
---
 .../class/askpricesupplier.class.php          | 32 +++++++---
 htdocs/comm/propal/class/propal.class.php     | 55 ++++++++--------
 htdocs/commande/class/commande.class.php      | 52 +++++++---------
 htdocs/compta/facture/class/facture.class.php | 49 +++++++--------
 htdocs/contrat/class/contrat.class.php        | 47 ++++++++++----
 htdocs/core/class/commonobject.class.php      | 62 +++++++++++++++++++
 htdocs/langs/en_US/margins.lang               |  2 +-
 7 files changed, 193 insertions(+), 106 deletions(-)

diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
index 26d412e87ea..2f563a17b1b 100644
--- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
+++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
@@ -2649,11 +2649,18 @@ class AskPriceSupplierLine  extends CommonObject
 
         if (empty($this->pa_ht)) $this->pa_ht=0;
 
-        // si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-        if ($this->pa_ht == 0) {
-        	if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-        		$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
-        }
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
+		}
 
         // Check parameters
         if ($this->product_type < 0) return -1;
@@ -2817,10 +2824,17 @@ class AskPriceSupplierLine  extends CommonObject
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
         $this->db->begin();
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4d632a84c54..8d4c91f097d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -496,17 +496,7 @@ class Propal extends CommonObject
             $this->line->date_start=$date_start;
             $this->line->date_end=$date_end;
 
-
-			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-			    // by external module, take lowest buying price
-			    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
-			}
+			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
             // Mise en option de la ligne
@@ -660,16 +650,7 @@ class Propal extends CommonObject
             $this->line->skip_update_total	= $skip_update_total;
             $this->line->fk_unit	= $fk_unit;
 
-            // infos marge
-            if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-                // by external module, take lowest buying price
-                include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
-			}
+			$this->line->fk_fournprice = $fk_fournprice;
             $this->line->pa_ht = $pa_ht;
 
             $this->line->date_start=$date_start;
@@ -3124,11 +3105,18 @@ class PropaleLigne  extends CommonObjectLine
 
         if (empty($this->pa_ht)) $this->pa_ht=0;
 
-        // si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-        if ($this->pa_ht == 0) {
-        	if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-        		$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
-        }
+       // if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
+		}
 
         // Check parameters
         if ($this->product_type < 0) return -1;
@@ -3296,10 +3284,17 @@ class PropaleLigne  extends CommonObjectLine
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
         $this->db->begin();
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index d43314a8816..e3926603f86 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1281,16 +1281,7 @@ class Commande extends CommonOrder
             $this->line->date_start=$date_start;
             $this->line->date_end=$date_end;
 
-			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-			    // by external module, take lowest buying price
-			    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
-			}
+			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
             // TODO Ne plus utiliser
@@ -2509,16 +2500,7 @@ class Commande extends CommonOrder
             $this->line->skip_update_total=$skip_update_total;
 	        $this->line->fk_unit=$fk_unit;
 
-			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-			    //by external module, take lowest buying price
-			    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
-			}
+			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
             // TODO deprecated
@@ -3550,10 +3532,17 @@ class OrderLine extends CommonOrderLine
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
         // Check parameters
@@ -3677,10 +3666,17 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigné et utilisé pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
 		$this->db->begin();
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index bd3e2dac6f0..bc286cd2a59 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2361,16 +2361,7 @@ class Facture extends CommonInvoice
 			$this->line->situation_percent  = $situation_percent;
 			$this->line->fk_unit				= $fk_unit;
 
-			// infos marge
-			if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) {
-			    // POS or external module, take lowest buying price
-			    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-			    $productFournisseur = new ProductFournisseur($this->db);
-			    $productFournisseur->find_min_price_product_fournisseur($fk_product);
-			    $this->line->fk_fournprice = $productFournisseur->product_fourn_price_id;
-			} else {
-			    $this->line->fk_fournprice = $fk_fournprice;
-			}
+			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
 			if (is_array($array_options) && count($array_options)>0) {
@@ -3883,10 +3874,17 @@ class FactureLigne extends CommonInvoiceLine
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
 		// Check parameters
@@ -3906,14 +3904,6 @@ class FactureLigne extends CommonInvoiceLine
 			}
 		}
 
-		// POS or by external module, take lowest buying price
-		if (!empty($this->fk_product) && empty($this->fk_fournprice) && empty($this->pa_ht)) {
-		    include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-		    $productFournisseur = new ProductFournisseur($this->db);
-		    $productFournisseur->find_min_price_product_fournisseur($this->fk_product);
-		    $this->fk_fournprice = $productFournisseur->product_fourn_price_id;
-		}
-
 		$this->db->begin();
 
 		// Insertion dans base de la ligne
@@ -4081,10 +4071,17 @@ class FactureLigne extends CommonInvoiceLine
 
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
 		$this->db->begin();
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 1d2bd9f4181..e38bb254f79 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1283,10 +1283,18 @@ class Contrat extends CommonObject
 
 		    if (empty($pa_ht)) $pa_ht=0;
 
-			// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-			if ($pa_ht == 0) {
-				if ($pu_ht > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-					$pa_ht = $pu_ht * (1 - $remise_percent / 100);
+			
+			// if buy price not defined, define buyprice as configured in margin admin
+			if ($this->pa_ht == 0) 
+			{
+				if (($result = $this->defineBuyPrice($pu_ht, $remise_percent, $fk_product)) < 0)
+				{
+					return $result;
+				}
+				else
+				{
+					$pa_ht = $result;
+				}
 			}
 
 			// Insertion dans la base
@@ -1456,10 +1464,17 @@ class Contrat extends CommonObject
 
 	    if (empty($pa_ht)) $pa_ht=0;
 
-		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
-		if ($pa_ht == 0) {
-			if ($pu > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$pa_ht = $pu * (1 - $remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($pu_ht, $remise_percent)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$pa_ht = $result;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($desc)."'";
@@ -2481,12 +2496,20 @@ class ContratLigne extends CommonObjectLine
 
 	    if (empty($this->pa_ht)) $this->pa_ht=0;
 
-		// si prix d'achat non renseigné et utilisé pour calcul des marges alors prix achat = prix vente
-		if ($this->pa_ht == 0) {
-			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
-				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		// if buy price not defined, define buyprice as configured in margin admin
+		if ($this->pa_ht == 0) 
+		{
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
+			{
+				return $result;
+			}
+			else
+			{
+				$this->pa_ht = $result;
+			}
 		}
 
+
 		$this->db->begin();
 
 		// Update request
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d5dac206e15..2aacad9a7ff 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4176,4 +4176,66 @@ abstract class CommonObject
 
 		return true;
 	}
+	
+	 /**
+	 * define buy price if not defined
+	 *	set buy price = sell price if ForceBuyingPriceIfNull configured,
+	 *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, set pmp as buyprice
+	 *	 else set min buy price as buy price
+	 *	 
+	 * @param float		$unitPrice		 product unit price
+	 * @param float		$discountPercent line discount percent
+	 * @param int		$fk_product		 product id
+	 *
+	 * @return	float <0 if ko, buyprice if ok
+	 */
+	public function defineBuyPrice($unitPrice = 0, $discountPercent = 0, $fk_product = 0) 
+	{
+		global $conf;
+	
+		$buyPrice = 0;
+		
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
+		{
+			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
+		}
+		else
+		{
+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+			// Get PMP
+			if (! empty($fk_product))
+			{
+				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
+				{
+					$product = new Product($this->db);
+					$result = $product->fetch($fk_product);
+					if ($result <= 0)
+					{
+						$this->error='ErrorProductIdDoesNotExists';
+						return -1;
+					}
+					if (($product->pmp > 0))
+					{
+						$buyPrice = $product->pmp;
+					}
+					// TODO add option to set PMP of product
+				}
+				else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
+				{
+					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+					$productFournisseur = new ProductFournisseur($this->db);
+					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
+					{
+						$buyPrice = $productFournisseur->fourn_price;
+					}
+					else
+					{
+						$this->error = $productFournisseur->error;
+						return -1;
+					}
+				}
+			}
+		}
+		return $buyPrice;
+	}
 }
diff --git a/htdocs/langs/en_US/margins.lang b/htdocs/langs/en_US/margins.lang
index eb77ca9fe4c..9aeaf8d60e6 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -24,7 +24,7 @@ StartDate=Start date
 EndDate=End date
 Launch=Start
 ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
+ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service

From b1bc000bae790cdb6814147671f17dc3d0082f88 Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Tue, 27 Oct 2015 09:19:39 +0100
Subject: [PATCH 023/216] standardize

---
 htdocs/core/lib/pdf.lib.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 0bd13869ce8..0d7f18e1c75 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1088,12 +1088,6 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 	if ($idprod)
 	{
 		$prodser->fetch($idprod);
-
-        //can change ref in hook
-        if(isset($object->lines[$i]->ref)){
-        $prodser->ref = $object->lines[$i]->ref;
-        }
-
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
 		if (! empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
 		{

From 8992cfaeb437cd26178906e07af2674c0d2297ca Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Tue, 27 Oct 2015 15:50:55 +0100
Subject: [PATCH 024/216] move require_once

---
 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 2aacad9a7ff..dbc9686002a 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -4201,12 +4201,12 @@ abstract class CommonObject
 		}
 		else
 		{
-			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			// Get PMP
 			if (! empty($fk_product))
 			{
 				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
 				{
+					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
 					$result = $product->fetch($fk_product);
 					if ($result <= 0)
@@ -4222,7 +4222,7 @@ abstract class CommonObject
 				}
 				else if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')
 				{
-					include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 					$productFournisseur = new ProductFournisseur($this->db);
 					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
 					{

From 87c240252c4ade8a164ed5eab97cb309bab2631d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 27 Oct 2015 22:24:18 +0100
Subject: [PATCH 025/216] FIX Can export a field into task time table with
 export project profile

---
 htdocs/core/modules/modProjet.class.php | 4 ++--
 htdocs/langs/en_US/projects.lang        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 6ac8b877ad6..ff4adeb1986 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -300,8 +300,8 @@ class modProjet extends DolibarrModules
         	}
         }
         // End add extra fields
-		$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array('ptt.task_date'=>'TaskTimeDate','ptt.task_duration'=>"TimesSpent",'ptt.fk_user'=>"TaskTimeUser",'ptt.note'=>"TaskTimeNote"));
-        $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r], array('ptt.task_date'=>'task_time','ptt.task_duration'=>"task_time",'ptt.fk_user'=>"task_time",'ptt.note'=>"task_time"));
+		$this->export_fields_array[$r]=array_merge($this->export_fields_array[$r], array('ptt.rowid'=>'IdTaskTime','ptt.task_date'=>'TaskTimeDate','ptt.task_duration'=>"TimesSpent",'ptt.fk_user'=>"TaskTimeUser",'ptt.note'=>"TaskTimeNote"));
+        $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r], array('ptt.rowid'=>'task_time','ptt.task_date'=>'task_time','ptt.task_duration'=>"task_time",'ptt.fk_user'=>"task_time",'ptt.note'=>"task_time"));
 
         $this->export_sql_start[$r]='SELECT DISTINCT ';
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'projet as p';
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index d9fecb40ad4..4ed6ccfc2f5 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -175,6 +175,7 @@ ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by mo
 ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
+IdTaskTime=Id task time
 OpenedProjectsByThirdparties=Opened projects by thirdparties
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount

From 9a95401473ae5f6deede751dab6ef8802dfae7ad Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 28 Oct 2015 11:27:39 +0100
Subject: [PATCH 026/216] FIX : add tag myuser_job into ODT replacement

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

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 24c2fe34a93..c2634cbaaed 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -75,6 +75,7 @@ abstract class CommonDocGenerator
             'myuser_mobile'=>$user->user_mobile,
             'myuser_email'=>$user->email,
         	'myuser_logo'=>$user->photo,
+        	'myuser_job'=>$user->job,
             'myuser_web'=>''	// url not exist in $user object
         );
     }

From f385f8bcfa1c44930e46c94430d76b9aa9deba3f Mon Sep 17 00:00:00 2001
From: phf <phf@atm-consulting.fr>
Date: Wed, 28 Oct 2015 14:34:34 +0100
Subject: [PATCH 027/216] FIX better fix to generate a PROV ref after clone

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 567c3f1a702..fff3f64de8d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -978,6 +978,7 @@ class Commande extends CommonOrder
         }
 
         $this->id=0;
+		$this->ref = '';
         $this->statut=self::STATUS_DRAFT;
 
         // Clear fields
@@ -986,18 +987,9 @@ class Commande extends CommonOrder
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_client         = '';
-
-        // Set ref
-		$this->ref = '(PROV)';
-
+		
         // Create clone
         $result=$this->create($user);
-        if ($result < 0) $error++;
-
-		// Set new ref
-		$newref='(PROV'.$this->id.')';
-        $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($newref)."' WHERE rowid=".$this->id;
-        $result=$this->db->query($sql);
         if ($result < 0) $error++;
 
         if (! $error)

From e2ba24826ffe5b9061808c084778d08780cbeceb Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 29 Oct 2015 06:06:56 +0100
Subject: [PATCH 028/216] Review 3.8

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index fce013be146..9c2879db463 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -974,6 +974,7 @@ Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
 Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
 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=All parameters available in the setup area allow you to setup Dolibarr before starting using it.
 SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page:
 SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country).

From 4e9d06785c762aaff28eba9305d5839175be84b4 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Thu, 29 Oct 2015 06:47:42 +0100
Subject: [PATCH 029/216] Fix #3818 & presentation

---
 htdocs/admin/security.php     | 17 +++++++++++------
 htdocs/langs/en_US/admin.lang |  3 +++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 84c5ecb92e4..fe20d868e83 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -292,6 +292,7 @@ $var=!$var;
 	$this->NbRepeat = $tabConf[4];
 	$this->WithoutAmbi = $tabConf[5];
 	*/
+	print '<br>';
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="3"> '.$langs->trans("PasswordPatternDesc").'</td>';
@@ -332,13 +333,17 @@ $var=!$var;
 	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>';
-
-	$var=!$var;
-	print "<tr ".$bc[$var].">";
-	print '<td colspan="2"></td><td width="103" align="center"><a id="linkChangePattern">'.$langs->trans("Save").'</a></td>';
-	print '</tr>';
+	
 	print '</table>';
 
+	print '<br>';
+	print '<table align="right">';
+	print '<tr><td>';
+	print '<a class="button" id="linkChangePattern">'.$langs->trans("Save").'</a>';
+	print '</td></tr>';
+	print '</table>';
+	print '<br><br>';
+
 	print '<script type="text/javascript">';
 	print '	function getStringArg(){';
 	print '		var pattern = "";';
@@ -389,7 +394,7 @@ $var=!$var;
 // Cryptage mot de passe
 print '<br>';
 $var=true;
-print "<form method=\"post\" action=\"security.php\">";
+print "<form method=\"post\" action=\"" . $_SERVER["PHP_SELF"] . "\">";
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print "<input type=\"hidden\" name=\"action\" value=\"encrypt\">";
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9c2879db463..cfb5e9644be 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1111,6 +1111,9 @@ EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
 ##### Module password generation
 PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually.
+PasswordGenerationPerso=Return a password according to your personally defined configuration.
+SetupPerso=According to your configuration
+PasswordPatternDesc=Password pattern description
 ##### Users setup #####
 UserGroupSetup=Users and groups module setup
 GeneratePassword=Suggest a generated password

From 7940b249f5f60b1e9edfa2dda1345c23635a6a5a Mon Sep 17 00:00:00 2001
From: jfefe <jf.ferry@aternatik.fr>
Date: Thu, 29 Oct 2015 09:58:43 +0100
Subject: [PATCH 030/216] Update Readme.md

Add badges to show build status and downloads per day.
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 576e3153ef9..f6f4b8be34f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # DOLIBARR ERP & CRM
 
+![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg) ![Downloads per day](https://img.shields.io/sourceforge/dd/dolibarr.svg)
+
 Dolibarr ERP & CRM is a modern software to manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda, ...).
 
 It's an Open Source software (wrote in PHP language) designed for small and medium companies, foundation and freelances.

From 62dc6814a35a8fb2f79b1bb0744e83dcaede75df Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Thu, 29 Oct 2015 10:14:54 +0100
Subject: [PATCH 031/216] FIX #3726 Not showing images on product card

---
 htdocs/core/lib/functions.lib.php | 2 +-
 htdocs/product/document.php       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 04c2c02a7d5..861bd766a83 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3764,7 +3764,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 	// TODO if object is null, load it from id and modulepart.
 
 
-	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier')))
+	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier','product')))
 	{
 		// 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);
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index cb174e5847e..6e953648efe 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -70,8 +70,10 @@ if ($id > 0 || ! empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/';
+    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/';
+	if($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)$upload_dir.= get_exdir($object->id,2,0,0,$object,'product').$object->id."/photos";
+	else $upload_dir.= dol_sanitizeFileName($object->ref);
 }
 $modulepart='produit';
 

From 6469a31a32877a449157991eb1e09b1e855ef971 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Thu, 29 Oct 2015 10:38:21 +0100
Subject: [PATCH 032/216] Style corrections

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

diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 6e953648efe..a85f5d08cd8 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].'/';
     elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/';
-	if($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)$upload_dir.= get_exdir($object->id,2,0,0,$object,'product').$object->id."/photos";
+	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $upload_dir.= get_exdir($object->id,2,0,0,$object,'product').$object->id."/photos";
 	else $upload_dir.= dol_sanitizeFileName($object->ref);
 }
 $modulepart='produit';

From e5b1e214bc97ec36004a1fa461ffda974f54184c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 29 Oct 2015 11:50:16 +0100
Subject: [PATCH 033/216] Fix: add missing hooks

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e80b4939baf..beeb60394c3 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1197,7 +1197,9 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		// TODO add hook function
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		return $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
 	{
@@ -1223,7 +1225,9 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		// TODO add hook function
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		return $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
 	{
@@ -1248,7 +1252,9 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		// TODO add hook function
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		return $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
 	{
@@ -1330,10 +1336,9 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-		foreach($object->hooks as $modules)
-		{
-			if (method_exists($modules[$special_code],'pdf_getlineupwithtax')) return $modules[$special_code]->pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails);
-		}
+		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+		$action='';
+		return $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	}
 	else
 	{
@@ -1487,8 +1492,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 				'special_code' => $special_code
 			);
 			$action = '';
-			return $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object,
-				$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 		} else {
 			if (empty($hidedetails) || $hidedetails > 1) {
 				return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
@@ -1656,7 +1660,9 @@ function pdf_getTotalQty($object,$type,$outputlangs)
 			{
 				$special_code = $object->lines[$i]->special_code;
 				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-				// TODO add hook function
+				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
+				$action='';
+				return $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 			}
 			else if ($type==0 && $object->lines[$i]->product_type == 0)
 			{
@@ -1692,7 +1698,7 @@ function pdf_getLinkedObjects($object,$outputlangs)
 		if ($objecttype == 'propal')
 		{
 			$outputlangs->load('propal');
-			
+
 			foreach($objects as $elementobject)
 			{
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");

From 310ecb1e09f24cf0062930651d05bc7098ef021a Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Thu, 29 Oct 2015 12:28:28 +0100
Subject: [PATCH 034/216] FIX: Show product image on getNomUrl()

---
 htdocs/contrat/card.php                                  | 4 +++-
 htdocs/contrat/index.php                                 | 9 ++++++---
 htdocs/contrat/services.php                              | 3 ++-
 htdocs/core/boxes/box_produits.php                       | 3 ++-
 htdocs/core/boxes/box_produits_alerte_stock.php          | 3 ++-
 htdocs/fourn/card.php                                    | 3 ++-
 htdocs/fourn/product/list.php                            | 3 ++-
 .../canvas/product/actions_card_product.class.php        | 3 ++-
 htdocs/product/class/product.class.php                   | 6 ++++--
 htdocs/product/composition/card.php                      | 5 ++++-
 htdocs/product/list.php                                  | 3 ++-
 htdocs/product/reassort.php                              | 3 ++-
 htdocs/product/reassortlot.php                           | 3 ++-
 htdocs/product/stock/card.php                            | 3 ++-
 htdocs/product/stock/mouvement.php                       | 3 ++-
 15 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index ef7ff8e5522..c40e9ab677d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1317,7 +1317,7 @@ else
             $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
             $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
 	        $sql.= " cd.fk_unit,";
-            $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype";
+            $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity";
             $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
             $sql.= " WHERE cd.rowid = ".$object->lines[$cursorline-1]->id;
@@ -1352,6 +1352,7 @@ else
                         $productstatic->id=$objp->fk_product;
                         $productstatic->type=$objp->ptype;
                         $productstatic->ref=$objp->pref;
+						$productstatic->entity=$objp->pentity;
                         $text = $productstatic->getNomUrl(1,'',20);
                         if ($objp->label)
                         {
@@ -1485,6 +1486,7 @@ else
                         $productstatic->id=$objp->fk_product;
                         $productstatic->type=$objp->ptype;
                         $productstatic->ref=$objp->pref;
+						$productstatic->entity=$objp->pentity;
                         print $productstatic->getNomUrl(1,'',20);
                         print $objp->label?' - '.dol_trunc($objp->label,16):'';
                         print '<br>';
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 56cdbe90ca3..b9297d41c73 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -371,7 +371,7 @@ print '<br>';
 $sql = "SELECT c.ref, c.fk_soc, ";
 $sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
 $sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
+$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -413,6 +413,7 @@ if ($resql)
     		$productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
+			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
 		}
 		else
@@ -449,7 +450,7 @@ print '<br>';
 // Not activated services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
 $sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
+$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -493,6 +494,7 @@ if ($resql)
     		$productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
+			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
 		}
 		else
@@ -528,7 +530,7 @@ print '<br>';
 // Expired services
 $sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
 $sql.= " s.nom as name,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
+$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype, p.entity as pentity";
 $sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
 $sql.= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -573,6 +575,7 @@ if ($resql)
     		$productstatic->id=$obj->fk_product;
             $productstatic->type=$obj->ptype;
             $productstatic->ref=$obj->pref;
+			$productstatic->entity=$obj->pentity;
             print $productstatic->getNomUrl(1,'',20);
 		}
 		else
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index cd07db385aa..fdc130b010e 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -98,7 +98,7 @@ llxHeader();
 $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
 $sql.= " s.rowid as socid, s.nom as name,";
 $sql.= " cd.rowid, cd.description, cd.statut,";
-$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype,";
+$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
 $sql.= " cd.date_ouverture_prevue,";
 $sql.= " cd.date_ouverture,";
@@ -225,6 +225,7 @@ if ($resql)
 			$productstatic->id=$obj->pid;
 			$productstatic->type=$obj->ptype;
 			$productstatic->ref=$obj->pref;
+			$productstatic->entity=$obj->pentity;
 			print $productstatic->getNomUrl(1,'',20);
             print $obj->label?' - '.dol_trunc($obj->label,16):'';
             if (! empty($obj->description) && ! empty($conf->global->PRODUCT_DESC_IN_LIST)) print '<br>'.dol_nl2br($obj->description);
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 509502183af..042526224a2 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -64,7 +64,7 @@ class box_produits extends ModeleBoxes
 
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
-			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression";
+			$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element, 1).')';
 			if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0';
@@ -103,6 +103,7 @@ class box_produits extends ModeleBoxes
                     $productstatic->ref = $objp->ref;
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
+					$productstatic->entity = $objp->entity;
 
 					$this->info_box_contents[$line][] = array(
                         'td' => 'align="left"',
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 06442571b6e..66f1cbbfe3b 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -66,7 +66,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		if ($user->rights->produit->lire || $user->rights->service->lire)
 		{
-			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte,";
+			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.seuil_stock_alerte,p.entity,";
 			$sql.= " SUM(".$db->ifsql("s.reel IS NULL","0","s.reel").") as total_stock";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
 			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
@@ -110,6 +110,7 @@ class box_produits_alerte_stock extends ModeleBoxes
                     $productstatic->ref = $objp->ref;
                     $productstatic->type = $objp->fk_product_type;
                     $productstatic->label = $objp->label;
+					$productstatic->entity = $objp->entity;
 
                     $this->info_box_contents[$line][] = array(
                         'td' => 'align="left"',
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 55993221d41..5188003c115 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -337,7 +337,7 @@ if ($object->id > 0)
 
 		//Query from product/liste.php
 		$sql = 'SELECT p.rowid, p.ref, p.label, pfp.tms,';
-		$sql.= ' p.fk_product_type';
+		$sql.= ' p.fk_product_type, p.entity';
 		$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).')';
@@ -361,6 +361,7 @@ if ($object->id > 0)
 				$productstatic->ref = $objp->ref;
 				$productstatic->label = $objp->label;
 				$productstatic->type = $objp->fk_product_type;
+				$productstatic->entity = $objp->entity;
 
 				print "<tr ".$bc[$var].">";
 				print '<td class="nowrap">';
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 33e1ea46dd9..4b3e05eeea8 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -86,7 +86,7 @@ if ($fourn_id)
 	$supplier->fetch($fourn_id);
 }
 
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,";
+$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";
 $sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -212,6 +212,7 @@ if ($resql)
 		$productstatic->id=$objp->rowid;
 		$productstatic->ref=$objp->ref;
 		$productstatic->type=$objp->fk_product_type;
+		$productstatic->entity=$objp->entity;
 		print $productstatic->getNomUrl(1,'supplier');
 		print '</td>';
 
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index aba6325d234..e32d31122dc 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -341,7 +341,7 @@ class ActionsCardProduct
 		$sql = 'SELECT DISTINCT ';
 
 		// Fields requiered
-		$sql.= 'p.rowid, p.price_base_type, p.fk_product_type, p.seuil_stock_alerte';
+		$sql.= 'p.rowid, p.price_base_type, p.fk_product_type, p.seuil_stock_alerte, p.entity';
 
 		// Fields not requiered
 		foreach($this->field_list as $field)
@@ -417,6 +417,7 @@ class ActionsCardProduct
 							$this->id 		= $obj->rowid;
 							$this->ref 		= $obj->$alias;
 							$this->type 	= $obj->fk_product_type;
+							$this->entity	= $obj->entity;
 							$datas[$alias] 	= $this->getNomUrl(1,'',24);
 						}
 						else if ($alias == 'stock')
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 6f4e37c8ab2..3496773e018 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2768,7 +2768,8 @@ class Product extends CommonObject
 					'type'=>$type,				// Nb of units that compose parent product
 					'desiredstock'=>$this->desiredstock,
 					'level'=>$level,
-					'incdec'=>$incdec
+					'incdec'=>$incdec,
+					'entity'=>$this->entity
 				);
 
 				// Recursive call if there is childs to child
@@ -2850,7 +2851,7 @@ class Product extends CommonObject
 	 */
 	function getFather()
 	{
-		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec";
+		$sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
 		$sql.= " ".MAIN_DB_PREFIX."product as p";
 		$sql.= " WHERE p.rowid = pa.fk_product_pere";
@@ -2868,6 +2869,7 @@ class Product extends CommonObject
 				$prods[$record['id']]['qty'] = $record['qty'];
 				$prods[$record['id']]['incdec'] = $record['incdec'];
 				$prods[$record['id']]['fk_product_type'] =  $record['fk_product_type'];
+				$prods[$record['id']]['entity'] =  $record['entity'];
 			}
 			return $prods;
 		}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 96e4c955cd6..71742f261cf 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -139,7 +139,7 @@ if ($action == 'search')
 {
 	$current_lang = $langs->getDefaultLang();
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
+    $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.tms as datem';
 	if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= ', pl.label as labelm, pl.description as descriptionm';
 	$sql.= ' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -278,6 +278,7 @@ if ($id > 0 || ! empty($ref))
 					$productstatic->type=$value["fk_product_type"];
 					$productstatic->ref=$value['ref'];
 					$productstatic->label=$value['label'];
+					$productstatic->entity=$value['entity'];
 
 					$class=($class=='impair')?'pair':'impair';
 					print '<tr class="'.$class.'">';
@@ -334,6 +335,7 @@ if ($id > 0 || ! empty($ref))
 					$productstatic->id=$value['id'];
 					$productstatic->type=$value['type'];
 					$productstatic->label=$value['label'];
+					$productstatic->entity=$value['entity'];
 
 					if ($value['level'] <= 1)
 					{
@@ -542,6 +544,7 @@ if ($id > 0 || ! empty($ref))
 						$productstatic->ref=$objp->ref;
 						$productstatic->label=$objp->label;
 						$productstatic->type=$objp->type;
+						$productstatic->entity=$objp->entity;
 
 						print '<td>'.$productstatic->getNomUrl(1,'',24).'</td>';
 						$labeltoshow=$objp->label;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 77e8373d2a7..c7789761cd3 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -133,7 +133,7 @@ else
     // Add what we are searching for
     if (! empty($sall)) $texte.= " - ".$sall;
 
-    $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
+    $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.tms as datem,';
     $sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
@@ -431,6 +431,7 @@ else
     			$product_static->ref = $objp->ref;
                 $product_static->label = $objp->label;
     			$product_static->type = $objp->fk_product_type;
+				$product_static->entity = $objp->entity;
     			print $product_static->getNomUrl(1,'',24);
     			print "</td>\n";
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 8bd2096af69..40b1e0f9816 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -101,7 +101,7 @@ $htmlother=new FormOther($db);
 
 $title=$langs->trans("ProductsAndServices");
 
-$sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
+$sql = 'SELECT 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 as datem,';
 $sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' SUM(s.reel) as stock_physique';
@@ -307,6 +307,7 @@ if ($resql)
 		$product_static->id=$objp->rowid;
         $product_static->label = $objp->label;
 		$product_static->type=$objp->fk_product_type;
+		$product_static->entity=$objp->entity;
 		print $product_static->getNomUrl(1,'',16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
 		print '</td>';
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 86410df8a00..9ebffd5673d 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -104,7 +104,7 @@ $htmlother=new FormOther($db);
 
 $title=$langs->trans("ProductsAndServices");
 
-$sql = 'SELECT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
+$sql = 'SELECT 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 as datem,';
 $sql.= ' p.duration, p.tosell as statut, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
 $sql.= ' s.fk_entrepot,';
@@ -324,6 +324,7 @@ if ($resql)
 		$product_static->id=$objp->rowid;
         $product_static->label = $objp->label;
 		$product_static->type=$objp->fk_product_type;
+		$product_static->entity=$objp->entity;
 		print $product_static->getNomUrl(1,'',16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
 		print '</td>';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 22ed390bc8f..034fd71a2bb 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -394,7 +394,7 @@ else
 			$totalunit=0;
 			$totalvalue=$totalvaluesell=0;
 
-			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc,";
+			$sql = "SELECT p.rowid as rowid, p.ref, p.label as produit, p.fk_product_type as type, p.pmp as ppmp, p.price, p.price_ttc, p.entity,";
 			$sql.= " ps.pmp, ps.reel as value";
 			$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps, ".MAIN_DB_PREFIX."product as p";
 			$sql.= " WHERE ps.fk_product = p.rowid";
@@ -438,6 +438,7 @@ else
                     $productstatic->ref = $objp->ref;
                     $productstatic->label = $objp->produit;
 					$productstatic->type=$objp->type;
+					$productstatic->entity=$objp->entity;
 					print $productstatic->getNomUrl(1,'stock',16);
 					print '</td>';
 					print '<td>'.$objp->produit.'</td>';
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 26a2aef8e12..d5deffb2c12 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -164,7 +164,7 @@ $form=new Form($db);
 $formother=new FormOther($db);
 $formproduct=new FormProduct($db);
 
-$sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.fk_product_type as type,";
+$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,";
 $sql.= " m.rowid as mid, m.value, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
 $sql.= " m.batch,m.eatby,m.sellby,";
@@ -575,6 +575,7 @@ if ($resql)
         $productstatic->ref=$objp->product_ref;
         $productstatic->label=$objp->produit;
         $productstatic->type=$objp->type;
+        $productstatic->entity=$objp->entity;
         print $productstatic->getNomUrl(1,'',16);
         print "</td>\n";
         // Product label

From dba952e59620cbdde0eec624f1fa5e179a7d2b39 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Thu, 29 Oct 2015 12:51:25 +0100
Subject: [PATCH 035/216] Fix: Products image on getNomUrl

---
 htdocs/margin/productMargins.php | 3 ++-
 htdocs/societe/consumption.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 07d4a75a522..990acd801c7 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -162,7 +162,7 @@ if (! empty($conf->global->DISPLAY_MARK_RATES)) {
 print "</table>";
 print '</form>';
 
-$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref,";
+$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity";
 if ($id > 0) $sql.= " d.fk_product,";
 if ($id > 0) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
 $sql.= " sum(d.total_ht) as selling_price,";
@@ -264,6 +264,7 @@ if ($result)
 				$product_static->id=$objp->rowid;
 				$product_static->ref=$objp->ref;
 				$product_static->label=$objp->label;
+				$product_static->entity=$objp->pentity;
 				$text=$product_static->getNomUrl(1);
 				print $text.= ' - '.$objp->label;
 				print "</td>\n";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index e075f67cdaf..7697c203048 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -285,7 +285,7 @@ $sql = $sql_select;
 $sql.= ' d.description as description,';
 if ($type_element != 'fichinter' && $type_element != 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,';
 if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty,';
-if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type,';
+if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity';
 $sql.= " s.rowid as socid ";
 if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
@@ -402,6 +402,7 @@ if ($sql_select)
 			$product_static->type=$objp->fk_product_type;
 			$product_static->id=$objp->fk_product;
 			$product_static->ref=$objp->ref;
+			$product_static->entity=$objp->pentity;
 			$text=$product_static->getNomUrl(1);
 		}
 

From 6373c82559aba850f1b9dfd1823f8b49f8f54aa1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 29 Oct 2015 13:14:38 +0100
Subject: [PATCH 036/216] Fix: broken features !!!

---
 htdocs/core/lib/pdf.lib.php | 48 ++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index beeb60394c3..44c4154a038 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1199,7 +1199,8 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1227,7 +1228,8 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1254,7 +1256,8 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1281,7 +1284,8 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1311,7 +1315,8 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1338,7 +1343,8 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
-		return $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+		return $hookmanager->resPrint;
 	}
 	else
 	{
@@ -1367,7 +1373,8 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1397,7 +1404,8 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1427,7 +1435,8 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1457,7 +1466,8 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1492,7 +1502,8 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 				'special_code' => $special_code
 			);
 			$action = '';
-			return $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		} else {
 			if (empty($hidedetails) || $hidedetails > 1) {
 				return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
@@ -1525,7 +1536,8 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1552,7 +1564,8 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 			$action = '';
-			return $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		} else {
 			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
 		}
@@ -1587,7 +1600,8 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1622,7 +1636,8 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 			$action='';
-			return $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+			return $hookmanager->resPrint;
 		}
 		else
 		{
@@ -1662,7 +1677,8 @@ function pdf_getTotalQty($object,$type,$outputlangs)
 				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 				$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 				$action='';
-				return $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('pdf_getTotalQty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				return $hookmanager->resPrint;
 			}
 			else if ($type==0 && $object->lines[$i]->product_type == 0)
 			{

From 440df980ea930a22a1927bd025b895603c528278 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Thu, 29 Oct 2015 13:43:07 +0100
Subject: [PATCH 037/216] Fix SQL Query

---
 htdocs/margin/productMargins.php | 2 +-
 htdocs/societe/consumption.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 990acd801c7..3f2893ffcfb 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -162,7 +162,7 @@ if (! empty($conf->global->DISPLAY_MARK_RATES)) {
 print "</table>";
 print '</form>';
 
-$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity";
+$sql = "SELECT p.label, p.rowid, p.fk_product_type, p.ref, p.entity as pentity,";
 if ($id > 0) $sql.= " d.fk_product,";
 if ($id > 0) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
 $sql.= " sum(d.total_ht) as selling_price,";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 7697c203048..2282b42cf0f 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -285,7 +285,7 @@ $sql = $sql_select;
 $sql.= ' d.description as description,';
 if ($type_element != 'fichinter' && $type_element != 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty,';
 if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty,';
-if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity';
+if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
 $sql.= " s.rowid as socid ";
 if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;

From e5063010b2d1b813cd69b686cdd12c3cf0c53ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 29 Oct 2015 19:07:00 +0100
Subject: [PATCH 038/216] Update actions_printing.inc.php

---
 htdocs/core/actions_printing.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 431ac89a94e..6dfd1122eac 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -46,7 +46,12 @@ if ($action == 'print_file' and $user->rights->printing->read)
 
             if (! empty($conf->global->{$printer->active})) {
                 $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
-                $errorprint = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
+                $module = GETPOST('printer', 'alpha');
+                if ($module =='commande_fournisseur') {
+                    $module = 'fournisseur';
+                    $subdir = 'commande';
+                }
+                $errorprint = $printer->print_file(GETPOST('file', 'alpha'), $module, $subdir);
                 //if ($errorprint < 0) {
                 //    setEventMessage($interface->errors, 'errors');
                 //}

From b1c4e032fc09f5447058d11a4969deb9f952fa65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 29 Oct 2015 19:08:38 +0100
Subject: [PATCH 039/216] 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 230ffa99504..59a7c183d76 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -285,7 +285,7 @@ class FormFile
         }
 
         $printer=0;
-        if (in_array($modulepart,array('facture','askpricesupplier','propal','proposal','order','commande','expedition')))	// The direct print feature is implemented only for such elements
+        if (in_array($modulepart,array('facture','askpricesupplier','propal','proposal','order','commande','expedition', 'commande_fournisseur')))	// The direct print feature is implemented only for such elements
         {
             $printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled))?true:false;
         }

From ff9648eed9fa59ecb7e85a4f546b0303f424456d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 29 Oct 2015 19:09:37 +0100
Subject: [PATCH 040/216] Update card.php

---
 htdocs/fourn/commande/card.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 37809f6bf87..cb1754fa8d3 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -872,6 +872,8 @@ if (empty($reshook))
 		}
 	}
 
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
 
 	/*
 	 * Create an order

From 282972784ee3ac3874ef0ad2c0d65c48e202fe6f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Oct 2015 19:18:41 +0100
Subject: [PATCH 041/216] Prepare table for budget lines

---
 .../install/mysql/migration/3.8.0-3.9.0.sql   | 30 ++++++++++++++++++
 .../install/mysql/tables/llx_budget_lines.sql | 31 +++++++++++++++++++
 .../mysql/tables/llx_stock_lotserial.sql      | 12 ++++---
 3 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_budget_lines.sql

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index a425ca2e3f2..94d7cd53314 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -194,3 +194,33 @@ ALTER TABLE llx_projet_task_time ADD COLUMN invoice_id integer DEFAULT NULL;
 ALTER TABLE llx_projet_task_time ADD COLUMN invoice_line_id integer DEFAULT NULL;
 
 
+create table llx_stock_lotserial
+(
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  entity          integer,
+  fk_product      integer NOT NULL,				-- Id of product
+  batch           varchar(30) DEFAULT NULL,		-- Lot or serial number
+  eatby           date DEFAULT NULL,			-- Eatby date
+  sellby          date DEFAULT NULL, 			-- Sellby date
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
+) ENGINE=innodb;
+
+
+create table llx_budget_lines
+(
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer NOT NULL DEFAULT 1,
+  label         varchar(255) NOT NULL,
+  fk_project	integer NOT NULL,
+  amount		double(24,8) NOT NULL,
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
+)ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
new file mode 100644
index 00000000000..58d900a3e14
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -0,0 +1,31 @@
+-- ============================================================================
+-- Copyright (C) 2015	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_budget_lines
+(
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer NOT NULL DEFAULT 1,
+  label         varchar(255) NOT NULL,
+  fk_project	integer NOT NULL,
+  amount		double(24,8) NOT NULL,
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stock_lotserial.sql b/htdocs/install/mysql/tables/llx_stock_lotserial.sql
index a9099480e42..ed8a14e49d0 100644
--- a/htdocs/install/mysql/tables/llx_stock_lotserial.sql
+++ b/htdocs/install/mysql/tables/llx_stock_lotserial.sql
@@ -21,12 +21,14 @@
 create table llx_stock_lotserial
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  datec           datetime,
-  tms             timestamp,
-  fk_user_creat   integer,
-  fk_user_modif   integer,
+  entity          integer,
   fk_product      integer NOT NULL,				-- Id of product
   batch           varchar(30) DEFAULT NULL,		-- Lot or serial number
   eatby           date DEFAULT NULL,			-- Eatby date
-  sellby          date DEFAULT NULL 			-- Sellby date
+  sellby          date DEFAULT NULL, 			-- Sellby date
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
 ) ENGINE=innodb;

From c481dc88ce63cc456201045c696bf99f06c1f8f1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Oct 2015 20:25:07 +0100
Subject: [PATCH 042/216] Clean dead code

---
 htdocs/societe/list.php | 52 +----------------------------------------
 1 file changed, 1 insertion(+), 51 deletions(-)

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 0e102af33f9..732fe834728 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -147,56 +147,6 @@ if (empty($reshook))
 	}
 }
 
-// special search
-/*if ($mode == 'search')
-{
-	$sql = "SELECT s.rowid";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if ($search_sale || (!$user->rights->societe->client->voir && !$socid)) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    // We'll need this table joined to the select in order to filter by categ
-    if ($search_categ) $sql.= ", ".MAIN_DB_PREFIX."categorie_societe as cs";
-    $sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
-    // sall criteria
-    $sql.= natural_search($fields, $sall);
-
-	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
-    if ($search_categ) $sql.= " AND s.rowid = cs.fk_soc";   // Join for the needed table to filter by categ
-	if (! $user->rights->societe->lire || ! $user->rights->fournisseur->lire)
-	{
-		if (! $user->rights->fournisseur->lire) $sql.=" AND s.fournisseur != 1";
-	}
-    // Insert sale filter
-    if ($search_sale)
-    {
-        $sql .= " AND sc.fk_user = ".$search_sale;
-    }
-    // Insert categ filter
-    if ($search_categ)
-    {
-        $sql .= " AND cs.fk_categorie = ".$search_categ;
-    }
-    // Filter on type of thirdparty
-	if ($search_type > 0 && in_array($search_type,array('1,3','2,3'))) $sql .= " AND s.client IN (".$db->escape($search_type).")";
-	if ($search_type > 0 && in_array($search_type,array('4')))         $sql .= " AND s.fournisseur = 1";
-	if ($search_type == '0') $sql .= " AND s.client = 0 AND s.fournisseur = 0";
-
-	$result=$db->query($sql);
-	if ($result)
-	{
-		if ($db->num_rows($result) == 1)
-		{
-			$obj = $db->fetch_object($result);
-			$socid = $obj->rowid;
-			header("Location: ".DOL_URL_ROOT."/societe/soc.php?socid=".$socid);
-			exit;
-		}
-		$db->free($result);
-	}
-}
-*/
-
 // Do we click on 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
 {
@@ -584,7 +534,7 @@ if ($resql)
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
 
 	print '<tr class="liste_titre">';
-	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"],"s.nom","",$param,"",$sortfield,$sortorder);
     if (! empty($arrayfields['s.barcode']['checked']))        print_liste_field_titre($langs->trans("Gencod"), $_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);

From 2b5746aec38d620a683d3cd24ff332d73704c1e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Oct 2015 21:05:47 +0100
Subject: [PATCH 043/216] Add field position into some dictionaries tables

---
 htdocs/install/mysql/data/llx_c_typent.sql            | 2 ++
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql        | 3 +++
 htdocs/install/mysql/tables/llx_c_forme_juridique.sql | 3 ++-
 htdocs/install/mysql/tables/llx_c_type_fees.sql       | 3 ++-
 htdocs/install/mysql/tables/llx_c_typent.sql          | 3 ++-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_typent.sql b/htdocs/install/mysql/data/llx_c_typent.sql
index 918230cc5a3..11b512f26c2 100644
--- a/htdocs/install/mysql/data/llx_c_typent.sql
+++ b/htdocs/install/mysql/data/llx_c_typent.sql
@@ -31,6 +31,7 @@
 --
 
 delete from llx_c_typent;
+-- Entries for all countries
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  0, 'TE_UNKNOWN', '-',             NULL, 1);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  1, 'TE_STARTUP', 'Start-up',      NULL, 0);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  2, 'TE_GROUP',   'Grand groupe',  NULL, 1);
@@ -41,6 +42,7 @@ insert into llx_c_typent (id,code,libelle,fk_country,active) values (  6, 'TE_WH
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  7, 'TE_RETAIL',  'Revendeur',     NULL, 0);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (  8, 'TE_PRIVATE', 'Particulier',   NULL, 1);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (100, 'TE_OTHER',   'Autres',        NULL, 1);
+-- Argentina (country 23)
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (231, 'TE_A_RI',    'Responsable Inscripto',    23, 0);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (232, 'TE_B_RNI',   'Responsable No Inscripto', 23, 0);
 insert into llx_c_typent (id,code,libelle,fk_country,active) values (233, 'TE_C_FE',    'Consumidor Final/Exento',  23, 0);
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 94d7cd53314..82dff688eda 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -224,3 +224,6 @@ create table llx_budget_lines
   import_key    integer  
 )ENGINE=innodb;
 
+ALTER TABLE llx_c_typent ADD COLUMN position integer NOT NULL DEFAULT 0;
+ALTER TABLE llx_c_forme_juridique ADD COLUMN position integer NOT NULL DEFAULT 0;
+ALTER TABLE llx_c_type_fees ADD COLUMN position integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql
index 0087f371092..ea8b45bf2d7 100644
--- a/htdocs/install/mysql/tables/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/tables/llx_c_forme_juridique.sql
@@ -25,6 +25,7 @@ create table llx_c_forme_juridique
   libelle    	varchar(255),
   isvatexempted	tinyint DEFAULT 0  NOT NULL,
   active     	tinyint DEFAULT 1  NOT NULL,
-  module        varchar(32) NULL
+  module        varchar(32) NULL,
+  position      integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_type_fees.sql b/htdocs/install/mysql/tables/llx_c_type_fees.sql
index e980562aff2..80bb3d9109d 100644
--- a/htdocs/install/mysql/tables/llx_c_type_fees.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_fees.sql
@@ -25,5 +25,6 @@ create table llx_c_type_fees
   label				varchar(30),
   accountancy_code	varchar(32) NULL,
   active    		tinyint DEFAULT 1   NOT NULL,
-  module    		varchar(32) NULL
+  module    		varchar(32) NULL,
+  position          integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_typent.sql b/htdocs/install/mysql/tables/llx_c_typent.sql
index 06a41727b69..d492c41ff13 100644
--- a/htdocs/install/mysql/tables/llx_c_typent.sql
+++ b/htdocs/install/mysql/tables/llx_c_typent.sql
@@ -24,5 +24,6 @@ create table llx_c_typent
   libelle    varchar(30),
   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
+  module     varchar(32) NULL,
+  position   integer NOT NULL DEFAULT 0
 )ENGINE=innodb;

From 3760f247a2f21f0249cf4c1aa906c8afd66399d2 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 29 Oct 2015 22:12:11 +0100
Subject: [PATCH 044/216] NEW Can now select fields to show in product list.
 Extrafields are also supported.

---
 htdocs/core/class/extrafields.class.php |  52 ++-
 htdocs/product/list.php                 | 427 ++++++++++++++++--------
 htdocs/societe/class/societe.class.php  |   6 +-
 htdocs/societe/list.php                 |  64 +++-
 htdocs/user/index.php                   |  59 +++-
 5 files changed, 447 insertions(+), 161 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index aa2f014c7ba..55cf274e78c 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1111,7 +1111,7 @@ class ExtraFields
 	 *
 	 * @param   string	$key            Key of attribute
 	 * @param   string	$value          Value to show
-	 * @param	string	$moreparam		More param
+	 * @param	string	$moreparam		To add more parametes on html input tag (only checkbox use html input for output rendering)
 	 * @return	string					Formated value
 	 */
 	function showOutputField($key,$value,$moreparam='')
@@ -1128,6 +1128,8 @@ class ExtraFields
 		$perms=$this->attribute_perms[$key];
 		$list=$this->attribute_list[$key];
 
+		$showsize=0;
+		
 		if ($type == 'date')
 		{
 			$showsize=10;
@@ -1357,11 +1359,59 @@ class ExtraFields
 			$showsize=round($size);
 			if ($showsize > 48) $showsize=48;
 		}
+		
 		//print $type.'-'.$size;
 		$out=$value;
+		
 		return $out;
 	}
 
+	/**
+	 * Return tag to describe alignement to use for this extrafield
+	 *
+	 * @param   string	$key            Key of attribute
+	 * @return	string					Formated value
+	 */
+	function getAlignFlag($key)
+	{
+		global $conf,$langs;
+
+		$type=$this->attribute_type[$key];
+
+		$align='';
+		
+		if ($type == 'date')
+		{
+			$align="center";
+		}
+		elseif ($type == 'datetime')
+		{
+			$align="center";
+		}
+		elseif ($type == 'int')
+		{
+			$align="right";
+		}
+		elseif ($type == 'double')
+		{
+			$align="right";
+		}
+		elseif ($type == 'boolean')
+		{
+			$align="center";
+		}
+		elseif ($type == 'radio')
+		{
+			$align="center";
+		}
+		elseif ($type == 'checkbox')
+		{
+			$align="center";
+		}
+	
+		return $align;
+	}
+	
 	/**
 	 * Return HTML string to print separator extrafield
 	 *
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index d54db832d7e..dc9dcb7ed58 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -56,18 +56,28 @@ $fourn_id = GETPOST("fourn_id",'int');
 $catid = GETPOST('catid','int');
 $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;
+$offset = $liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (! $sortfield) $sortfield="p.ref";
 if (! $sortorder) $sortorder="ASC";
 
-$limit = $conf->liste_limit;
+$contextpage='productservicelist';
+if ($type === '1') { $contextpage='servicelist'; if ($search_type=='') $search_type='1'; }
+if ($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);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('product');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas=GETPOST("canvas");
@@ -107,15 +117,18 @@ if (! empty($conf->barcode->enabled)) {
  * Actions
  */
 
+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
 {
-	$sref="";
 	$sall="";
-	$sbarcode="";
+	$sref="";
 	$snom="";
+	$sbarcode="";
 	$search_categ=0;
 	$tosell="";
 	$tobuy="";
+	$search_array_options=array();
 }
 
 
@@ -152,10 +165,17 @@ else
 	}
 
     $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,';
-    $sql.= ' p.fk_product_type, p.tms as datem,';
-    $sql.= ' p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+    $sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
+    $sql.= ' p.datec as date_creation, p.tms as date_update,';
     $sql.= ' MIN(pfp.unitprice) as minsellprice';
+	// Add fields from extrafields
+	foreach ($extrafields->attribute_label as $key => $val) $sql.=",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
@@ -181,11 +201,33 @@ else
     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;
+	// 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'))) $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.tms,";
-    $sql.= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
+    $sql.= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
+    $sql.= ' p.datec, p.tms';
+	// Add fields from extrafields
+	foreach ($extrafields->attribute_label as $key => $val) $sql.=",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;
     //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
-
     $nbtotalofrecords = 0;
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 	{
@@ -230,12 +272,24 @@ else
 		    setEventMessage($langs->trans("ProductDeleted", GETPOST('delprod')));
 	    }
 
-    	$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;tosell=".$tosell."&amp;tobuy=".$tobuy;
-    	$param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
-    	$param.=($search_categ?"&amp;search_categ=".$search_categ:"");
-    	$param.=isset($type)?"&amp;type=".$type:"";
+    	if ($sref) $param="&amp;sref=".$sref;
+    	if ($sbarcode) $param.=($sbarcode?"&amp;sbarcode=".$sbarcode:"");
+    	if ($snom) $param.="&amp;snom=".$snom;
+    	if ($sall) $param.="&amp;sall=".$sall;
+    	if ($tosell != '') $param.="&amp;tosell=".$tosell;
+    	if ($tobuy != '') $param.="&amp;tobuy=".$tobuy;
+    	if ($fourn_id) $param.=($fourn_id?"&amp;fourn_id=".$fourn_id:"");
+    	if ($seach_categ) $param.=($search_categ?"&amp;search_categ=".$search_categ:"");
+    	if ($type != '') $param.='&amp;type='.urlencode($type);
 		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);
+	    } 	
+		
     	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_products.png');
 
     	if (! empty($catid))
@@ -270,6 +324,7 @@ else
     		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.'">';
@@ -283,13 +338,6 @@ else
             
     		// Filter on categories
     	 	$moreforfilter='';
-    	 	$colspan=6;
-    	 	if (! empty($conf->barcode->enabled)) $colspan++;
-    	 	if (! empty($conf->service->enabled) && $type != 0) $colspan++;
-    	 	if (empty($conf->global->PRODUIT_MULTIPRICES)) $colspan++;
-    	 	if ($user->rights->fournisseur->lire) $colspan++;
-    	 	if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) $colspan+=2;
-
     		if (! empty($conf->categorie->enabled))
     		{
                 $moreforfilter.='<div class="divsearchfield">';
@@ -307,93 +355,162 @@ else
     		    print '</div>';
     		}
 
-    		// Lignes des titres
-    		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->barcode->enabled)) print_liste_field_titre($langs->trans("BarCode"), $_SERVER["PHP_SELF"], "p.barcode",$param,'','',$sortfield,$sortorder);
-    		print_liste_field_titre($langs->trans("DateModification"), $_SERVER["PHP_SELF"], "p.tms",$param,"",'align="center"',$sortfield,$sortorder);
-    		if (! empty($conf->service->enabled) && $type != 0) print_liste_field_titre($langs->trans("Duration"), $_SERVER["PHP_SELF"], "p.duration",$param,"",'align="center"',$sortfield,$sortorder);
-    		if (empty($conf->global->PRODUIT_MULTIPRICES))
+    	    if (empty($conf->global->PRODUIT_MULTIPRICES))
     		{
-    			$titlefield=$langs->trans("SellingPrice");
+    			$titlesellprice=$langs->trans("SellingPrice");
     		   	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
    				{
-					$titlefield=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
+					$titlesellprice=$form->textwithpicto($langs->trans("SellingPrice"), $langs->trans("DefaultPriceRealPriceMayDependOnCustomer"));
     			}
-    			print_liste_field_titre($titlefield, $_SERVER["PHP_SELF"], "p.price",$param,"",'align="right"',$sortfield,$sortorder);
     		}
-    		if ($user->rights->fournisseur->lire) print_liste_field_titre($langs->trans("BuyingPriceMinShort"), '', '', '', '', 'align="right"');
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("DesiredStock"), '', '', '', '', 'align="right"');
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1) print_liste_field_titre($langs->trans("PhysicalStock"), '', '', '', '', 'align="right"');
-    		print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Sell").')', $_SERVER["PHP_SELF"], "p.tosell",$param,"",'align="center"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("Status").' ('.$langs->trans("Buy").')', $_SERVER["PHP_SELF"], "p.tobuy",$param,"",'align="center"',$sortfield,$sortorder);
-            print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    		
+    		$arrayfields=array(
+		        'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+		        '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.sellprice'=>array('label'=>$titlesellprice, 'checked'=>1, 'enabled'=>empty($conf->global->PRODUIT_MULTIPRICES)),
+			    'p.minbuyprice'=>array('label'=>$langs->trans("BuyingPriceMinShort"), 'checked'=>1, 'enabled'=>(! empty($user->rights->fournisseur->lire))),
+				'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')),
+				'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("Purchases").')', '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]);
+			   }
+			}
+    		$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+		    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+			print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
+    		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.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,"",$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.desiredstock']['checked']))  print_liste_field_titre($arrayfields['p.desiredstock']['label'], $_SERVER["PHP_SELF"],"p.desirestock","",$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 (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="center"',$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="center"',$sortfield,$sortorder);
+			print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
 			print "</tr>\n";
 
-    		// Lignes des champs de filtre
+    		// Lines with input filters
     		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre" align="left">';
-    		print '<input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'">';
-    		print '</td>';
-    		print '<td class="liste_titre" align="left">';
-    		print '<input class="flat" type="text" name="snom" size="12" value="'.dol_escape_htmltag($snom).'">';
-    		print '</td>';
+    		if (! empty($arrayfields['p.ref']['checked']))
+    		{
+    			print '<td class="liste_titre" align="left">';
+    			print '<input class="flat" type="text" name="sref" size="8" value="'.dol_escape_htmltag($sref).'">';
+    			print '</td>';
+    		}
+    		if (! empty($arrayfields['p.label']['checked']))
+    		{
+    			print '<td class="liste_titre" align="left">';
+		   		print '<input class="flat" type="text" name="snom" size="12" value="'.dol_escape_htmltag($snom).'">';
+    			print '</td>';
+    		}
     		// Barcode
-    		if (! empty($conf->barcode->enabled))
+    		if (! empty($arrayfields['p.barcode']['checked']))
     		{
     			print '<td class="liste_titre">';
     			print '<input class="flat" type="text" name="sbarcode" size="6" value="'.dol_escape_htmltag($sbarcode).'">';
     			print '</td>';
     		}
-    		// Date modification
-    		print '<td class="liste_titre">';
-    		print '&nbsp;';
-    		print '</td>';
-
     		// Duration
-    		if (! empty($conf->service->enabled) && $type != 0)
+			if (! empty($arrayfields['p.duration']['checked']))
     		{
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
     		}
-
     		// Sell price
-            if (empty($conf->global->PRODUIT_MULTIPRICES))
+			if (! empty($arrayfields['p.sellprice']['checked']))
             {
         		print '<td class="liste_titre" align="right">';
         		print '</td>';
             }
-
     		// Minimum buying Price
-    		if ($user->rights->fournisseur->lire) {
-    			print '<td class="liste_titre">';
-    			print '&nbsp;';
-    			print '</td>';
-    		}
-
-    		// Stock
-    		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
+			if (! empty($arrayfields['p.minbuyprice']['checked']))
     		{
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
-    			//desiredstock
+    		}
+    		// Desired stock
+			if (! empty($arrayfields['p.desiredstock']['checked']))
+    		{
     			print '<td class="liste_titre">';
     			print '&nbsp;';
     			print '</td>';
     		}
-
-    		print '<td class="liste_titre" align="center">';
-            print $form->selectarray('tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')),$tosell,1);
-            print '</td >';
-
-            print '<td class="liste_titre" align="center">';
-            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
-            print '</td>';
-
+    		// Stock
+			if (! empty($arrayfields['p.stock']['checked']))
+    		{
+    			print '<td class="liste_titre">';
+    			print '&nbsp;';
+    			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 class="liste_titre"></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['p.datec']['checked']))
+		    {
+		        print '<td class="liste_titre">';
+		        print '</td>';
+		    }
+		    // Date modification
+		    if (! empty($arrayfields['p.tms']['checked']))
+		    {
+		        print '<td class="liste_titre">';
+		        print '</td>';
+		    }
+    		if (! empty($arrayfields['p.tosell']['checked']))
+    		{
+	    		print '<td class="liste_titre" align="center">';
+	            print $form->selectarray('tosell', array('0'=>$langs->trans('ProductStatusNotOnSellShort'),'1'=>$langs->trans('ProductStatusOnSellShort')),$tosell,1);
+	            print '</td >';
+    		}
+			if (! empty($arrayfields['p.tobuy']['checked']))
+    		{
+	            print '<td class="liste_titre" align="center">';
+	            print $form->selectarray('tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'),'1'=>$langs->trans('ProductStatusOnBuyShort')),$tobuy,1);
+	            print '</td>';
+    		}
     		print '<td class="liste_titre nowrap" align="right">';
     		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 '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("RemoveFilter"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
@@ -427,32 +544,38 @@ else
     				}
     			}
 
-    			$var=!$var;
-    			print '<tr '.$bc[$var].'>';
-
-    			// Ref
-    			print '<td class="nowrap">';
     			$product_static->id = $objp->rowid;
     			$product_static->ref = $objp->ref;
                 $product_static->label = $objp->label;
     			$product_static->type = $objp->fk_product_type;
-    			print $product_static->getNomUrl(1,'',24);
-    			print "</td>\n";
+                $product_static->status_buy = $objp->tobuy;
+                $product_static->status     = $objp->tosell;
 
+    			$var=!$var;
+    			print '<tr '.$bc[$var].'>';
+
+    			// Ref
+			    if (! empty($arrayfields['p.ref']['checked']))
+			    {
+	    			print '<td class="nowrap">';
+	    			print $product_static->getNomUrl(1,'',24);
+	    			print "</td>\n";
+			    }
+			    
     			// Label
-    			print '<td>'.dol_trunc($objp->label,40).'</td>';
-
+			    if (! empty($arrayfields['p.label']['checked']))
+			    {
+			    	print '<td>'.dol_trunc($objp->label,40).'</td>';
+			    }
+			    
     			// Barcode
-    			if (! empty($conf->barcode->enabled))
-    			{
+			    if (! empty($arrayfields['p.barcode']['checked']))
+			    {
     				print '<td>'.$objp->barcode.'</td>';
     			}
 
-    			// Modification Date
-    			print '<td align="center">'.dol_print_date($db->jdate($objp->datem),'day')."</td>\n";
-
     			// Duration
-    			if (! empty($conf->service->enabled) && $type != 0)
+ 			    if (! empty($arrayfields['p.duration']['checked']))
     			{
     				print '<td align="center">';
     				if (preg_match('/([0-9]+)[a-z]/i',$objp->duration))
@@ -468,7 +591,7 @@ else
     			}
 
     			// Sell price
-    			if (empty($conf->global->PRODUIT_MULTIPRICES))
+ 			    if (! empty($arrayfields['p.sellprice']['checked']))
     			{
     			    print '<td align="right">';
     			    if ($objp->tosell)
@@ -480,7 +603,7 @@ else
     			}
 
     			// Better buy price
-    			if ($user->rights->fournisseur->lire)
+ 			    if (! empty($arrayfields['p.minbuyprice']['checked']))
     			{
         			print  '<td align="right">';
     			    if ($objp->tobuy && $objp->minsellprice != '')
@@ -502,62 +625,102 @@ else
         			print '</td>';
     			}
 
-    			// Show stock
-    			if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)
+        		if (! empty($conf->stock->enabled) && $user->rights->stock->lire && $type != 1)	// To optimize call of load_stock
     			{
     				if ($objp->fk_product_type != 1)
     				{
     					$product_static->id = $objp->rowid;
     					$product_static->load_stock();
-                        print '<td align="right">';
-                        print $objp->desiredstock;
-                        print '</td>';
-    					print '<td align="right">';
-                        if ($product_static->stock_reel < $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
-        				print $product_static->stock_reel;
-    					print '</td>';
-    				}
-    				else
-    				{
-		    			print '<td>';
-		    			print '&nbsp;';
-		    			print '</td>';
-		    			print '<td>';
-		    			print '&nbsp;';
-		    			print '</td>';
     				}
     			}
-
-                $product_static->status_buy = $objp->tobuy;
-                $product_static->status     = $objp->tosell;
+    			
+    			// Desired stock
+		        if (! empty($arrayfields['p.desiredstock']['checked']))
+        		{
+                    print '<td align="right">';
+    				if ($objp->fk_product_type != 1)
+    				{
+                        print $objp->desiredstock;
+    				}
+        		}
+				// Stock
+		        if (! empty($arrayfields['p.stock']['checked']))
+        		{
+    				print '</td>';
+   					print '<td align="right">';
+    				if ($objp->fk_product_type != 1)
+    				{
+   						if ($product_static->stock_reel < $objp->seuil_stock_alerte) print img_warning($langs->trans("StockTooLow")).' ';
+      					print $product_static->stock_reel;
+    				}
+    				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, $objp->$tmpkey, '', 1);
+							print '</td>';
+						}
+				   }
+				}
+		        // 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['p.datec']['checked']))
+		        {
+		            print '<td align="center">';
+		            print dol_print_date($objp->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 '</td>';
+		        }    			
+    			
                 // Status (to sell)
-                print '<td align="center" nowrap="nowrap">';
-                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 '</td>';
-
+		        if (! empty($arrayfields['p.tosell']['checked']))
+        		{
+	                print '<td align="center" nowrap="nowrap">';
+	                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 '</td>';
+        		}
                 // Status (to buy)
-                print '<td align="center" nowrap="nowrap">';
-                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 '</td>';
-
+		        if (! empty($arrayfields['p.tobuy']['checked']))
+        		{
+	        		print '<td align="center" nowrap="nowrap">';
+	                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 '</td>';
+        		}
+        		// Action	
                 print '<td>&nbsp;</td>';
 
                 print "</tr>\n";
     			$i++;
     		}
 
-    		$param="&sref=".$sref.($sbarcode?"&sbarcode=".$sbarcode:"")."&snom=".$snom."&sall=".$sall."&tosell=".$tosell."&tobuy=".$tobuy;
-    		$param.=($fourn_id?"&fourn_id=".$fourn_id:"");
-    		$param.=($search_categ?"&search_categ=".$search_categ:"");
-    		$param.=isset($type)?"&type=".$type:"";
     		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', '', '', 'paginationatbottom');
 
     		$db->free($resql);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index fb99f819af2..57049610390 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1760,7 +1760,7 @@ class Societe extends CommonObject
 
         if (! empty($conf->dol_no_mouse_hover)) $notooltip=1;
 
-		if ($conf->global->SOCIETE_ADD_REF_IN_LIST && (!empty($withpicto)))
+		if (! empty($conf->global->SOCIETE_ADD_REF_IN_LIST) && (!empty($withpicto)))
 		{
 			if (($this->client) && (! empty ( $this->code_client ))) {
 				$code = $this->code_client . ' - ';
@@ -1771,9 +1771,7 @@ class Societe extends CommonObject
 			$name =$code.' '.$name;
 		}
 
-	    if (!empty($this->name_alias)) {
-		    $name .= ' ('.$this->name_alias.')';
-	    }
+	    if (!empty($this->name_alias)) $name .= ' ('.$this->name_alias.')';
 
         $result=''; $label='';
         $link=''; $linkend='';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 732fe834728..6c554aa5137 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -75,13 +75,14 @@ $optioncss=GETPOST('optioncss','alpha');
 $mode=GETPOST("mode");
 $action=GETPOST('action');
 
+$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="s.nom";
 if ($page == -1) { $page = 0 ; }
-$offset = $conf->liste_limit * $page ;
+$offset = $limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -296,13 +297,13 @@ if ($search_sale) $sql .= ", sc.fk_soc, sc.fk_user";
 // We'll need these fields in order to filter by categ
 if ($search_categ) $sql .= ", cs.fk_categorie, cs.fk_soc";
 // Add fields from extrafields
-foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+foreach ($extrafields->attribute_label as $key => $val) $sql.=",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."societe as s";
-if (is_array($extrafields->attribute_list) && count($extrafields->attribute_list)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef on (s.rowid = ef.fk_object)";
 $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.= " ,".MAIN_DB_PREFIX."c_stcomm as st";
@@ -529,6 +530,14 @@ if ($resql)
         's.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
         's.status'=>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]);
+	   }
+	}
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
@@ -554,14 +563,15 @@ if ($resql)
 	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_list) && count($extrafields->attribute_list))
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_list as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val) 
 	   {
-	       if ($val)
-	       {
-	           if (! empty($arrayfields["ef.".$key]['checked'])) print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder);
-	       }
+           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
@@ -740,7 +750,18 @@ if ($resql)
 	    print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
 	    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 class="liste_titre">';
+				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
@@ -879,18 +900,21 @@ if ($resql)
 		if (($obj->client==1 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 		{
 	  		$companystatic->name=$langs->trans("Customer");
+	  		$companystatic->name_alias='';
 		    $s.=$companystatic->getNomUrl(0,'customer');
 		}
 		if (($obj->client==2 || $obj->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 		{
             if ($s) $s.=" / ";
 		    $companystatic->name=$langs->trans("Prospect");
-            $s.=$companystatic->getNomUrl(0,'prospect');
+	  		$companystatic->name_alias='';
+		    $s.=$companystatic->getNomUrl(0,'prospect');
 		}
 		if (! empty($conf->fournisseur->enabled) && $obj->fournisseur)
 		{
 			if ($s) $s.=" / ";
             $companystatic->name=$langs->trans("Supplier");
+	  		$companystatic->name_alias='';
             $s.=$companystatic->getNomUrl(0,'supplier');
 		}
 		print $s;
@@ -916,7 +940,23 @@ if ($resql)
 			}
 			print '</div></div></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, $obj->$tmpkey, '', 1);
+					print '</td>';
+				}
+		   }
+		}
         // 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
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 6b618552dc6..3af01d29046 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -55,14 +55,14 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($search_statut == '') $search_statut='1';
 
+$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;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$limit = $conf->liste_limit;
 if (! $sortfield) $sortfield="u.login";
 if (! $sortorder) $sortorder="ASC";
 
@@ -93,6 +93,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$search_datepreviouslogin="";
 	$search_date_creation="";
 	$search_date_update="";
+	$search_array_options=array();
 }
 
 // List of fields to search into when doing a "search in all"
@@ -135,12 +136,13 @@ $sql.= " u.tms as date_update, u.datec as date_creation,";
 $sql.= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2,";
 $sql.= " s.nom as name, s.canvas";
 // Add fields from extrafields
-foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key;
+foreach ($extrafields->attribute_label as $key => $val) $sql.=",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."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))))
@@ -236,6 +238,14 @@ if ($result)
         'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
         'u.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]);
+	   }
+	}
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
     print '<table class="noborder" width="100%">';
@@ -251,17 +261,18 @@ if ($result)
     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_list) && count($extrafields->attribute_list))
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 	{
-	   foreach($extrafields->attribute_list as $key => $val) 
+	   foreach($extrafields->attribute_label as $key => $val) 
 	   {
-	       if ($val)
-	       {
-	           if (! empty($arrayfields["ef.".$key]['checked'])) print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,"",$sortfield,$sortorder);
-	       }
+           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
+    // 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;
@@ -313,7 +324,14 @@ if ($result)
     {
         print '<td></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 class="liste_titre"></td>';
+	   }
+	}
     // Fields from hook
 	$parameters=array('arrayfields'=>$arrayfields);
     $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
@@ -480,11 +498,28 @@ if ($result)
             print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datepreviouslogin),"dayhour").'</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, $obj->$tmpkey, '', 1);
+					print '</td>';
+				}
+		   }
+		}
         // 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
+    	// Date creation
         if (! empty($arrayfields['u.datec']['checked']))
         {
             print '<td align="center">';

From 6cc3df7e71931c3016a51e08229c6216ce106ba4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2015 08:35:56 +0100
Subject: [PATCH 045/216] NEW Quick searh filter works on invoice, proposal,
 order, intervention, contract

---
 htdocs/core/ajax/selectsearchbox.php          | 50 ++++++++++++++-----
 htdocs/fourn/commande/list.php                |  2 +-
 .../install/mysql/migration/3.8.0-3.9.0.sql   | 30 ++++++++++-
 htdocs/install/mysql/tables/llx_budget.sql    | 33 ++++++++++++
 .../mysql/tables/llx_budget_lines.key.sql     | 27 ++++++++++
 .../install/mysql/tables/llx_budget_lines.sql |  3 +-
 htdocs/langs/en_US/main.lang                  | 20 +++++---
 7 files changed, 143 insertions(+), 22 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_budget.sql
 create mode 100644 htdocs/install/mysql/tables/llx_budget_lines.key.sql

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index a7149400f80..f4db125ca78 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -42,47 +42,73 @@ $arrayresult=array();
 // Define $searchform
 if ((( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
 {
-    $langs->load("companies");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/societe/list.php', DOL_URL_ROOT.'/societe/list.php', $langs->trans("ThirdParties"), 'soc', 'sall', 'T', 'searchleftt', img_object('','company'));
 	$arrayresult['searchintothirdparty']=array('text'=>img_picto('','object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
 {
-    $langs->load("companies");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/contact/list.php', DOL_URL_ROOT.'/contact/list.php', $langs->trans("Contacts"), 'contact', 'sall', 'A', 'searchleftc', img_object('','contact'));
 	$arrayresult['searchintocontact']=array('text'=>img_picto('','object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire))
 && empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
 {
-    $langs->load("products");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/product/list.php', DOL_URL_ROOT.'/product/list.php', $langs->trans("Products")."/".$langs->trans("Services"), 'products', 'sall', 'P', 'searchleftp', img_object('','product'));
 	$arrayresult['searchintoproduct']=array('text'=>img_picto('','object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
 {
-    $langs->load("projects");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
 	$arrayresult['searchintoprojects']=array('text'=>img_picto('','object_projectpub').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php?search_all='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
 {
-    $langs->load("members");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/adherents/list.php', DOL_URL_ROOT.'/adherents/list.php', $langs->trans("Members"), 'member', 'sall', 'M', 'searchleftm', img_object('','user'));
 	$arrayresult['searchintomember']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php?sall='.urlencode($search_boxvalue));
 }
 
 if (! empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->user->user->lire)
 {
-    $langs->load("users");
-    //$searchform.=printSearchForm(DOL_URL_ROOT.'/projet/list.php', DOL_URL_ROOT.'/projet/list.php', $langs->trans("Projects"), 'project', 'search_all', 'Q', 'searchleftproj', img_object('','projectpub'));
 	$arrayresult['searchintouser']=array('text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/index.php?sall='.urlencode($search_boxvalue));
 }
 
+if (! empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+{
+	$arrayresult['searchintoinvoice']=array('text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
+{
+	$arrayresult['searchintoorder']=array('text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
+{
+	$arrayresult['searchintopropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) && $user->rights->fournisseur->facture->lire)
+{
+	$arrayresult['searchintosupplierinvoice']=array('text'=>img_picto('','object_bill').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode($search_boxvalue));
+}
+if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
+{
+	$arrayresult['searchintosupplierorder']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
+}
+if (! empty($conf->askpricesupplier->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->askpricesupplier->lire)
+{
+	$arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/askpricesupplier/list.php?sall='.urlencode($search_boxvalue));
+}
+
+if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
+{
+	$arrayresult['searchintointervention']=array('text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
+}
+if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
+{
+	$arrayresult['searchintocontract']=array('text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
+}
+
+
 /* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag 
 if (! empty($conf->hrm->enabled) && ! empty($conf->global->MAIN_SEARCHFORM_EMPLOYEE) && $user->rights->hrm->employee->read)
 {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 768854063dd..6681b580861 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -38,13 +38,13 @@ $langs->load("orders");
 $langs->load("sendings");
 
 
+$sall=GETPOST('search_all');
 $search_ref=GETPOST('search_ref');
 $search_refsupp=GETPOST('search_refsupp');
 $search_company=GETPOST('search_company');
 $search_user=GETPOST('search_user');
 $search_ht=GETPOST('search_ht');
 $search_ttc=GETPOST('search_ttc');
-$sall=GETPOST('search_all');
 $search_status=(GETPOST('search_status','alpha')!=''?GETPOST('search_status','alpha'):GETPOST('statut','alpha'));	// alpha and not intbecause it can be '6,7'
 $optioncss = GETPOST('optioncss','alpha');
 
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 82dff688eda..dac62a2a4b8 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -210,11 +210,28 @@ create table llx_stock_lotserial
 ) ENGINE=innodb;
 
 
-create table llx_budget_lines
+
+create table llx_budget
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   entity		integer NOT NULL DEFAULT 1,
   label         varchar(255) NOT NULL,
+  status        integer,
+  note			text,	
+  date_start	date,
+  date_end		date,
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
+)ENGINE=innodb;
+
+
+create table llx_budget_lines
+(
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  fk_budget     integer NOT NULL,
   fk_project	integer NOT NULL,
   amount		double(24,8) NOT NULL,
   datec         datetime,
@@ -224,6 +241,17 @@ create table llx_budget_lines
   import_key    integer  
 )ENGINE=innodb;
 
+ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project);
+
+-- Supprime orphelins pour permettre montee de la cle
+-- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL;
+-- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget);
+
+ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_projet);
+ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid);
+
+
+
 ALTER TABLE llx_c_typent ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_c_forme_juridique ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_c_type_fees ADD COLUMN position integer NOT NULL DEFAULT 0;
diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
new file mode 100644
index 00000000000..aeb60cd1ce5
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_budget.sql
@@ -0,0 +1,33 @@
+-- ============================================================================
+-- Copyright (C) 2015	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_budget
+(
+  rowid			integer AUTO_INCREMENT PRIMARY KEY,
+  entity		integer NOT NULL DEFAULT 1,
+  label         varchar(255) NOT NULL,
+  status        integer,
+  note			text,	
+  date_start	date,
+  date_end		date,
+  datec         datetime,
+  tms           timestamp,
+  fk_user_creat integer,
+  fk_user_modif integer,
+  import_key    integer  
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.key.sql b/htdocs/install/mysql/tables/llx_budget_lines.key.sql
new file mode 100644
index 00000000000..9a9771570b1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_budget_lines.key.sql
@@ -0,0 +1,27 @@
+-- ===================================================================
+-- Copyright (C) 2015	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_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project);
+
+-- Supprime orphelins pour permettre montee de la cle
+-- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL;
+-- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget);
+
+ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project);
+ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid);
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 58d900a3e14..c5d3d3a4bf2 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -19,8 +19,7 @@
 create table llx_budget_lines
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
-  entity		integer NOT NULL DEFAULT 1,
-  label         varchar(255) NOT NULL,
+  fk_budget     integer NOT NULL,
   fk_project	integer NOT NULL,
   amount		double(24,8) NOT NULL,
   datec         datetime,
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 648ce25b9ce..4837a966394 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -752,9 +752,17 @@ ShortSaturday=S
 ShortSunday=S
 SelectMailModel=Select email template
 SetRef=Set ref
-SearchIntoThirdparties=Search %s into thirdparties
-SearchIntoContacts=Search %s into contacts
-SearchIntoMembers=Search %s into members
-SearchIntoUsers=Search %s into users
-SearchIntoProductsOrServices=Search %s into products or services
-SearchIntoProjects=Search %s into projects
\ No newline at end of file
+SearchIntoThirdparties=Thirdparties
+SearchIntoContacts=Contacts
+SearchIntoMembers=Members
+SearchIntoUsers=Users
+SearchIntoProductsOrServices=Products or services
+SearchIntoProjects=Projects
+SearchIntoCustomerInvoices=Customer invoices
+SearchIntoSupplierInvoices=Supplier invoices
+SearchIntoCustomerOrders=Customer orders
+SearchIntoSupplierOrders=Supplier orders
+SearchIntoCustomerProposals=Customer proposals
+SearchIntoSupplierProposals=Supplier proposals
+SearchIntoInterventions=Interventions
+SearchIntoContracts=Contracts

From c26c8c7fccfbca2a79768c49a29fd37f71319bfb Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 30 Oct 2015 08:47:30 +0100
Subject: [PATCH 046/216] [Qual] Prevent warning

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

diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index bf002ccde96..ce1b7eab988 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -123,7 +123,7 @@ print '<td align="right">'.$langs->trans("LibraryVersion").'</td>';
 print '</tr>';
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
-$model=new ModeleExports();
+$model=new ModeleExports($db);
 $liste=$model->liste_modeles($db);    // This is not a static method for exports because method load non static properties
 
 $var=true;

From 2c682022cf843d879a3e181ac73fae85a5317a68 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2015 09:36:57 +0100
Subject: [PATCH 047/216] NEW The search box and the bookmarks are now rendered
 by the menu manager.

---
 htdocs/comm/propal/index.php                |  6 ++--
 htdocs/commande/index.php                   |  6 ++--
 htdocs/contrat/index.php                    |  8 ++---
 htdocs/core/menus/standard/auguria.lib.php  | 36 +++++++++++++++++----
 htdocs/core/menus/standard/auguria_menu.php |  5 +--
 htdocs/core/menus/standard/eldy.lib.php     | 29 ++++++++++++++---
 htdocs/core/menus/standard/eldy_menu.php    |  5 +--
 htdocs/core/menus/standard/empty.php        | 13 +++++---
 htdocs/fichinter/index.php                  |  8 ++---
 htdocs/fourn/commande/index.php             |  6 ++--
 htdocs/main.inc.php                         | 33 ++++++++-----------
 11 files changed, 96 insertions(+), 59 deletions(-)

diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 1bcbec9723d..4b03cb48429 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -66,11 +66,9 @@ $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("SearchPropal").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" 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>';
+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 f9fe17ac1c2..8aa5ce64655 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -67,11 +67,9 @@ $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("SearchOrder").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" 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>';
+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/contrat/index.php b/htdocs/contrat/index.php
index 3a7b5667db5..c3972bab2f7 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -79,12 +79,10 @@ if (! empty($conf->contrat->enabled))
 	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("SearchAContract").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 	print '<tr '.$bc[$var].'>';
-	print '<td class="nowrap">'.$langs->trans("Ref").':</td><td><input type="text" class="flat" name="search_contract" size="18"></td>';
-	print '<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>';
+	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>";
 }
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 1cafd091521..9623958188d 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -205,14 +205,15 @@ function print_end_menu_array_auguria()
  * @param	DoliDB		$db                 Database handler
  * @param 	array		$menu_array_before  Table of menu entries to show before entries of menu handler
  * @param   array		$menu_array_after   Table of menu entries to show after entries of menu handler
- * @param  	array		$tabMenu       	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param  	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @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)
+ * @param	array		$moredata			An array with more data to output
  * @return	int								Nb of entries
  */
-function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='')
+function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='',$moredata=null)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
 
@@ -245,6 +246,16 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 		print '</div>'."\n";
 	}
 
+	if (is_array($moredata) && ! empty($moredata['searchform']))
+	{
+        print "\n";
+        print "<!-- Begin SearchForm -->\n";
+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+        print $moredata['searchform'];
+        print '</div>'."\n";
+        print "<!-- End SearchForm -->\n";
+	}
+	
 	// We update newmenu with entries found into database
 	$menuArbo = new Menubase($db,'auguria');
 	$newmenu = $menuArbo->menuLeftCharger($newmenu,$mainmenu,$leftmenu,($user->societe_id?1:0),'auguria',$tabMenu);
@@ -348,7 +359,7 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// Show menu
 	if (empty($noout))
 	{
-		$alt=0; $blockvmenuopened=false;
+		$alt=0; $altok=0; $blockvmenuopened=false;
 		$num=count($menu_array);
 		for ($i = 0; $i < $num; $i++)
 		{
@@ -358,14 +369,15 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 			$alt++;
 			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
+				$altok++;
 				$blockvmenuopened=true;
-				if (($alt%2==0))
+				if ($altok % 2 == 0)
 				{
-					print '<div class="blockvmenuimpair">'."\n";
+					print '<div class="blockvmenuimpair'.($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 				else
 				{
-					print '<div class="blockvmenupair">'."\n";
+					print '<div class="blockvmenupair'.($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 			}
 
@@ -437,8 +449,20 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 				if ($blockvmenuopened) { print "</div>\n"; $blockvmenuopened=false; }
 			}
 		}
+		
+		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/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index b54c746388e..a7c701aaeff 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -158,9 +158,10 @@ class MenuManager
      *  Show menu
      *
      *	@param	string	$mode		'top', 'left', 'jmobile'
+     *  @param	array	$moredata		An array with more data to output
      *  @return	string
 	 */
-	function showmenu($mode)
+	function showmenu($mode, $moredata=null)
 	{
     	global $conf, $langs, $user;
 
@@ -176,7 +177,7 @@ class MenuManager
         $this->menu=new Menu();
 
         if ($mode == 'top')  print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
-        if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
+        if ($mode == 'left') print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
         if ($mode == 'jmobile')
         {
         	print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 49c076de4c8..099d65f7f95 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -409,14 +409,15 @@ function print_end_menu_array()
  * @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)
- * @param	array		$tabMenu       	If array with menu entries already loaded, we put this array here (in most cases, it's empty)
+ * @param	array		$tabMenu       		If array with menu entries already loaded, we put this array here (in most cases, it's empty)
  * @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)
+ * @param	array		$moredata			An array with more data to output
  * @return	int								nb of menu entries
  */
-function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='')
+function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu,&$menu,$noout=0,$forcemainmenu='',$forceleftmenu='',$moredata=null)
 {
 	global $user,$conf,$langs,$dolibarr_main_db_name,$mysoc;
 
@@ -449,6 +450,16 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 		print '</div>'."\n";
 	}
 
+	if (is_array($moredata) && ! empty($moredata['searchform']))
+	{
+        print "\n";
+        print "<!-- Begin SearchForm -->\n";
+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
+        print $moredata['searchform'];
+        print '</div>'."\n";
+        print "<!-- End SearchForm -->\n";
+	}
+	
 	/**
 	 * We update newmenu with entries found into database
 	 * --------------------------------------------------
@@ -1407,11 +1418,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$blockvmenuopened=true;
 				if ($altok % 2 == 0)
 				{
-					print '<div class="blockvmenuimpair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+					print '<div class="blockvmenuimpair'.$invert.($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 				else
 				{
-					print '<div class="blockvmenupair'.$invert.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
+					print '<div class="blockvmenupair'.$invert.($altok == 1 ? ' blockvmenufirst':'').'">'."\n";
 				}
 			}
 
@@ -1484,6 +1495,16 @@ 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/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index fc66eef7fd6..4326de6d98f 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -112,9 +112,10 @@ class MenuManager
      *  Show menu
      *
      *	@param	string	$mode			'top', 'left', 'jmobile'
+     *  @param	array	$moredata		An array with more data to output
      *  @return string
      */
-    function showmenu($mode)
+    function showmenu($mode, $moredata=null)
     {
     	global $conf, $langs, $user;
 
@@ -132,7 +133,7 @@ class MenuManager
         if (empty($conf->global->MAIN_MENU_INVERT))
         {
         	if ($mode == 'top')  print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,0);
-        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0);
+        	if ($mode == 'left') print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$this->menu,0,'','',$moredata);
         }
         else
 		{
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 5c428ca9f13..e1b240a8e5e 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -61,9 +61,10 @@ class MenuManager
 	 *  Show menu
 	 *
      *	@param	string	$mode			'top', 'left', 'jmobile'
+     *  @param	array	$moredata		An array with more data to output
      *  @return	string
 	 */
-	function showmenu($mode)
+	function showmenu($mode, $moredata=null)
 	{
 		global $user,$conf,$langs,$dolibarr_main_db_name;
 
@@ -133,20 +134,22 @@ class MenuManager
 
 			if (empty($noout))
 			{
-				$alt=0;
+				$alt=0; $altok=0; $blockvmenuopened=false;
 				$num=count($this->menu->liste);
 				for ($i = 0; $i < $num; $i++)
 				{
 					$alt++;
 					if (empty($this->menu->liste[$i]['level']))
 					{
+			    		$altok++;
+						$blockvmenuopened=true;
 						if (($alt%2==0))
 						{
-							print '<div class="blockvmenuimpair">'."\n";
+							print '<div class="blockvmenuimpair'.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 						else
 						{
-							print '<div class="blockvmenupair">'."\n";
+							print '<div class="blockvmenupair'.($alt == 1 ? ' blockvmenufirst':'').'">'."\n";
 						}
 					}
 
@@ -201,6 +204,8 @@ class MenuManager
 						print "</div>\n";
 					}
 				}
+		
+				if ($altok) print '<div class="blockvmenuend"></div>';
 			}
 
 			if ($mode == 'jmobile')
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 81a2db9621c..03b217f9a91 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015	   Charlie Benke		<charlie@patas-monkey.com>
  
@@ -67,11 +67,9 @@ $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("SearchAnIntervention").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sref" 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>';
+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 cb91a65b341..c9de3c6a340 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -61,11 +61,9 @@ $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("SearchOrder").'</td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 print '<tr '.$bc[$var].'><td>';
-print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="search_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="search_all" size="18"></td>';
-print '</tr>';
+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/main.inc.php b/htdocs/main.inc.php
index dd4cd684970..b15cc6af213 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1543,13 +1543,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
  *  @param  string	$helppagename    	       	Name of wiki page for help ('' by default).
  * 				     		                   	Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
  * 									         		       For other external page: http://server/url
- *  @param  string	$moresearchform             Search Form Permanent Supplemental
+ *  @param  string	$notused             		Deprecated. Used in past to add content into left menu. Hooks can be used now.
  *  @param  array	$menu_array_after           Table of menu entries to show after entries of menu handler
  *  @param  int		$leftmenuwithoutmainarea    Must be set to 1. 0 by default for backward compatibility with old modules.
  *  @param  string	$title                      Title of web page
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename='', $moresearchform='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='')
+function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='')
 {
     global $user, $conf, $langs, $db, $form;
     global $hookmanager, $menumanager;
@@ -1644,13 +1644,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 
 	    print '<div class="vmenu">'."\n\n";
 
-	    $menumanager->menu_array = $menu_array_before;
-    	$menumanager->menu_array_after = $menu_array_after;
-	    $menumanager->showmenu('left'); // output menu_array and menu found in database
-
-
-	    // Show other forms
-	    if ($searchform)
+    	// Show other forms
+	    /*if ($searchform)
 	    {
 	        print "\n";
 	        print "<!-- Begin SearchForm -->\n";
@@ -1658,15 +1653,14 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        print $searchform;
 	        print '</div>'."\n";
 	        print "<!-- End SearchForm -->\n";
-	    }
+	    }*/
 
-	    // More search form
-	    if ($moresearchform)
-	    {
-	        print $moresearchform;
-	    }
+	    $menumanager->menu_array = $menu_array_before;
+    	$menumanager->menu_array_after = $menu_array_after;
+	    $menumanager->showmenu('left', array('searchform'=>$searchform, 'bookmarks'=>$bookmarks)); // output menu_array and menu found in database
 
 	    // Bookmarks
+	    /*
 	    if ($bookmarks)
 	    {
 	        print "\n";
@@ -1675,13 +1669,14 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
 	        print $bookmarks;
 	        print '</div>'."\n";
 	        print "<!-- End Bookmarks -->\n";
-	    }
+	    }*/
 
-        print "\n";
-        print "<!-- Begin Help Block-->\n";
+        // Dolibarr version + help + bug report link
+		print "\n";
+	    print "<!-- Begin Help Block-->\n";
         print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
-        //Dolibarr version
+        // Version
         $doliurl='http://www.dolibarr.org';
 		//local communities
 		if (preg_match('/fr/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.fr';

From c46f9350a583a6bcbd92ba2dc1af3bc75e3d7607 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 30 Oct 2015 09:50:04 +0100
Subject: [PATCH 048/216] Fix : stats were wrong if same product on several
 lines with same quantity because of distinct

---
 htdocs/product/stats/commande.php             | 5 +++--
 htdocs/product/stats/commande_fournisseur.php | 3 ++-
 htdocs/product/stats/facture.php              | 5 +++--
 htdocs/product/stats/facture_fournisseur.php  | 5 +++--
 htdocs/product/stats/propal.php               | 5 +++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 472b9ce4a45..d219088f9f9 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -118,8 +118,8 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
-		$sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.qty";
+		$sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
+		$sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, SUM(d.qty) as qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= ", ".MAIN_DB_PREFIX."commande as c";
@@ -131,6 +131,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= " AND d.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 c.fk_soc = ".$socid;
+		$sql.= " GROUP BY c.rowid ";
 		$sql.= " ORDER BY $sortfield $sortorder ";
 		$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 73de0374ebe..92179547e58 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -112,7 +112,7 @@ if ($id > 0 || ! empty($ref))
 
 		$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
 		$sql.= " c.rowid, c.total_ht as total_ht, c.ref,";
-		$sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty";
+		$sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, SUM(d.qty) as qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
@@ -124,6 +124,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= " AND d.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 c.fk_soc = ".$socid;
+		$sql.= " GROUP BY c.rowid ";
 		$sql.= " ORDER BY $sortfield $sortorder ";
 		$sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 49e5651b065..034ab4d9f30 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -124,9 +124,9 @@ if ($id > 0 || ! empty($ref))
 
 
         if ($user->rights->facture->lire) {
-            $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
+            $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
             $sql.= " f.facnumber, f.total as total_ht,";
-            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
+            $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, SUM(d.qty) as qty";
             if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
             $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
             $sql.= ", ".MAIN_DB_PREFIX."facture as f";
@@ -138,6 +138,7 @@ if ($id > 0 || ! empty($ref))
             $sql.= " AND d.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 f.fk_soc = $socid";
+            $sql.= " GROUP BY f.rowid ";
             $sql.= " ORDER BY $sortfield $sortorder ";
             $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index d8e30bdae6a..f1a8d908744 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -122,8 +122,8 @@ if ($id > 0 || ! empty($ref))
         print '</div>';
 
 
-        $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
-        $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
+        $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
+        $sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, SUM(d.qty) as qty";
         if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
         $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -135,6 +135,7 @@ if ($id > 0 || ! empty($ref))
         $sql.= " AND d.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 f.fk_soc = ".$socid;
+        $sql.= " GROUP BY f.rowid ";
         $sql.= " ORDER BY $sortfield $sortorder ";
         $sql.= $db->plimit($conf->liste_limit +1, $offset);
 
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 566961d9c5f..1e76071c682 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -113,8 +113,8 @@ if ($id > 0 || ! empty($ref))
 		print '</div>';
 
 
-		$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
-		$sql.= "p.datep, p.fk_statut as statut, d.qty";
+		$sql = "SELECT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
+		$sql.= "p.datep, p.fk_statut as statut, SUM(d.qty) as qty";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql.= ",".MAIN_DB_PREFIX."propal as p";
@@ -126,6 +126,7 @@ if ($id > 0 || ! empty($ref))
 		$sql.= " AND d.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 p.fk_soc = ".$socid;
+		$sql.= " GROUP BY p.rowid ";
 		$sql.= " ORDER BY $sortfield $sortorder ";
 		$sql.= $db->plimit($conf->liste_limit +1, $offset);
 

From 59714e4b32dae41aaa63f2945c4f82a9366d03ab Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 30 Oct 2015 12:41:36 +0100
Subject: [PATCH 049/216] Fix : migration wrong index

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index dac62a2a4b8..4f1e308b370 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -247,7 +247,7 @@ ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_pro
 -- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL;
 -- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget);
 
-ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_projet);
+ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project);
 ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid);
 
 

From 5862037d34fc0925da2bf379fb41ab071b7414e8 Mon Sep 17 00:00:00 2001
From: Ferran Marcet <fmarcet@2byte.es>
Date: Fri, 30 Oct 2015 13:03:34 +0100
Subject: [PATCH 050/216] FIX Bad parameters

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 2 +-
 1 file changed, 1 insertion(+), 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 ecedfd2092a..57f845696fe 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -191,7 +191,7 @@ class pdf_crabe extends ModelePDFFactures
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,'product') . $object->lines[$i]->fk_product ."/photos/";
+				$pdir = get_exdir($object->lines[$i]->fk_product,2,0,0,$objphoto,'product') . $object->lines[$i]->fk_product ."/photos/";
 				$dir = $conf->product->dir_output.'/'.$pdir;
 
 				$realpath='';

From e01bdebc495996fa8f75159e72b980df11a9f636 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2015 14:37:19 +0100
Subject: [PATCH 051/216] Fix translation

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

diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index 8e542e3d871..8a9f0e52c0a 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -66,7 +66,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("OrderLines");
+$textobject=$langs->transnoentitiesnoconv("Orders");
 
 llxHeader('',$langs->trans("OrdersSetup"));
 

From 1694c690ed8be103ab8311ac5396ec5f68fb1f2d Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Wed, 21 Oct 2015 18:23:35 +0200
Subject: [PATCH 052/216] Printing with Google Cloud Print

---
 .tx/config                                    |   6 +
 htdocs/admin/oauth.php                        | 335 ++++++++++++++
 htdocs/core/actions_printing.inc.php          |  11 +-
 htdocs/core/modules/modOauth.class.php        | 123 ++++++
 .../modules/oauth/getgoogleoauthcallback.php  | 110 +++++
 htdocs/core/modules/oauth/index.html          |   0
 .../modules/printing/modules_printing.php     |   6 +-
 .../modules/printing/printgcp.modules.php     | 331 +++++++-------
 .../modules/printing/printipp.modules.php     |  10 +-
 htdocs/includes/OAuth/Common/AutoLoader.php   |  81 ++++
 .../OAuth/Common/Consumer/Credentials.php     |  60 +++
 .../Common/Consumer/CredentialsInterface.php  |  24 ++
 .../OAuth/Common/Exception/Exception.php      |  10 +
 .../Common/Http/Client/AbstractClient.php     |  73 ++++
 .../Common/Http/Client/ClientInterface.php    |  32 ++
 .../OAuth/Common/Http/Client/CurlClient.php   | 142 ++++++
 .../OAuth/Common/Http/Client/StreamClient.php |  95 ++++
 .../Http/Exception/TokenResponseException.php |  12 +
 htdocs/includes/OAuth/Common/Http/Uri/Uri.php | 408 ++++++++++++++++++
 .../OAuth/Common/Http/Uri/UriFactory.php      | 168 ++++++++
 .../Common/Http/Uri/UriFactoryInterface.php   |  42 ++
 .../OAuth/Common/Http/Uri/UriInterface.php    | 133 ++++++
 .../OAuth/Common/Service/AbstractService.php  | 100 +++++
 .../OAuth/Common/Service/ServiceInterface.php |  49 +++
 .../OAuth/Common/Storage/DoliStorage.php      | 254 +++++++++++
 .../AuthorizationStateNotFoundException.php   |  10 +
 .../Storage/Exception/StorageException.php    |  12 +
 .../Exception/TokenNotFoundException.php      |  10 +
 .../includes/OAuth/Common/Storage/Memory.php  | 139 ++++++
 .../includes/OAuth/Common/Storage/Redis.php   | 230 ++++++++++
 .../includes/OAuth/Common/Storage/Session.php | 188 ++++++++
 .../OAuth/Common/Storage/SymfonySession.php   | 200 +++++++++
 .../Common/Storage/TokenStorageInterface.php  |  98 +++++
 .../OAuth/Common/Token/AbstractToken.php      | 128 ++++++
 .../Token/Exception/ExpiredTokenException.php |  12 +
 .../OAuth/Common/Token/TokenInterface.php     |  64 +++
 .../OAuth/OAuth1/Service/AbstractService.php  | 320 ++++++++++++++
 .../OAuth/OAuth1/Service/BitBucket.php        |  96 +++++
 htdocs/includes/OAuth/OAuth1/Service/Etsy.php | 132 ++++++
 .../includes/OAuth/OAuth1/Service/FitBit.php  |  96 +++++
 .../OAuth/OAuth1/Service/FiveHundredPx.php    | 120 ++++++
 .../includes/OAuth/OAuth1/Service/Flickr.php  | 133 ++++++
 .../OAuth/OAuth1/Service/QuickBooks.php       | 120 ++++++
 .../includes/OAuth/OAuth1/Service/Redmine.php |  96 +++++
 .../includes/OAuth/OAuth1/Service/ScoopIt.php |  96 +++++
 .../OAuth/OAuth1/Service/ServiceInterface.php |  45 ++
 .../includes/OAuth/OAuth1/Service/Tumblr.php  |  96 +++++
 .../includes/OAuth/OAuth1/Service/Twitter.php | 123 ++++++
 htdocs/includes/OAuth/OAuth1/Service/Xing.php |  97 +++++
 .../includes/OAuth/OAuth1/Service/Yahoo.php   | 131 ++++++
 .../UnsupportedHashAlgorithmException.php     |  12 +
 .../OAuth/OAuth1/Signature/Signature.php      | 132 ++++++
 .../OAuth1/Signature/SignatureInterface.php   |  28 ++
 .../OAuth/OAuth1/Token/StdOAuth1Token.php     |  75 ++++
 .../OAuth/OAuth1/Token/TokenInterface.php     |  41 ++
 .../OAuth/OAuth2/Service/AbstractService.php  | 364 ++++++++++++++++
 .../includes/OAuth/OAuth2/Service/Amazon.php  |  97 +++++
 .../includes/OAuth/OAuth2/Service/Bitly.php   | 111 +++++
 .../OAuth/OAuth2/Service/Bitrix24.php         | 118 +++++
 htdocs/includes/OAuth/OAuth2/Service/Box.php  |  88 ++++
 .../includes/OAuth/OAuth2/Service/Buffer.php  | 151 +++++++
 .../OAuth/OAuth2/Service/Dailymotion.php      | 129 ++++++
 .../OAuth/OAuth2/Service/Delicious.php        | 139 ++++++
 .../OAuth/OAuth2/Service/DeviantArt.php       |  99 +++++
 .../includes/OAuth/OAuth2/Service/Dropbox.php | 111 +++++
 .../OAuth/OAuth2/Service/EveOnline.php        | 100 +++++
 .../Exception/InvalidAccessTypeException.php  |  12 +
 .../InvalidAuthorizationStateException.php    |  10 +
 .../Exception/InvalidScopeException.php       |  17 +
 .../MissingRefreshTokenException.php          |  17 +
 .../OAuth/OAuth2/Service/Facebook.php         | 208 +++++++++
 .../OAuth/OAuth2/Service/Foursquare.php       |  81 ++++
 .../includes/OAuth/OAuth2/Service/GitHub.php  | 216 ++++++++++
 .../includes/OAuth/OAuth2/Service/Google.php  | 188 ++++++++
 .../includes/OAuth/OAuth2/Service/Harvest.php | 157 +++++++
 .../includes/OAuth/OAuth2/Service/Heroku.php  | 123 ++++++
 .../includes/OAuth/OAuth2/Service/Hubic.php   | 155 +++++++
 .../OAuth/OAuth2/Service/Instagram.php        |  85 ++++
 .../OAuth/OAuth2/Service/JawboneUP.php        | 144 +++++++
 .../OAuth/OAuth2/Service/Linkedin.php         | 103 +++++
 .../OAuth/OAuth2/Service/Mailchimp.php        | 114 +++++
 .../OAuth/OAuth2/Service/Microsoft.php        | 120 ++++++
 htdocs/includes/OAuth/OAuth2/Service/Nest.php | 106 +++++
 .../includes/OAuth/OAuth2/Service/Netatmo.php | 117 +++++
 .../OAuth2/Service/ParrotFlowerPower.php      | 142 ++++++
 .../includes/OAuth/OAuth2/Service/Paypal.php  | 103 +++++
 .../includes/OAuth/OAuth2/Service/Pocket.php  | 125 ++++++
 .../includes/OAuth/OAuth2/Service/Reddit.php  | 114 +++++
 .../OAuth/OAuth2/Service/RunKeeper.php        | 105 +++++
 .../OAuth/OAuth2/Service/Salesforce.php       |  92 ++++
 .../OAuth/OAuth2/Service/ServiceInterface.php |  38 ++
 .../OAuth/OAuth2/Service/SoundCloud.php       |  77 ++++
 .../includes/OAuth/OAuth2/Service/Spotify.php | 109 +++++
 .../includes/OAuth/OAuth2/Service/Strava.php  | 147 +++++++
 .../includes/OAuth/OAuth2/Service/Ustream.php |  98 +++++
 .../includes/OAuth/OAuth2/Service/Vimeo.php   | 156 +++++++
 .../OAuth/OAuth2/Service/Vkontakte.php        | 109 +++++
 .../includes/OAuth/OAuth2/Service/Yahoo.php   |  78 ++++
 .../includes/OAuth/OAuth2/Service/Yammer.php  |  82 ++++
 .../OAuth/OAuth2/Token/StdOAuth2Token.php     |  13 +
 .../OAuth/OAuth2/Token/TokenInterface.php     |   9 +
 htdocs/includes/OAuth/ServiceFactory.php      | 240 +++++++++++
 htdocs/includes/OAuth/bootstrap.php           |  13 +
 htdocs/langs/en_US/oauth.lang                 | 128 ++++++
 htdocs/langs/en_US/printing.lang              |   3 +
 htdocs/printing/admin/printing.php            |  48 ++-
 htdocs/printing/index.php                     |   3 +-
 107 files changed, 11017 insertions(+), 190 deletions(-)
 create mode 100644 htdocs/admin/oauth.php
 create mode 100644 htdocs/core/modules/modOauth.class.php
 create mode 100644 htdocs/core/modules/oauth/getgoogleoauthcallback.php
 create mode 100644 htdocs/core/modules/oauth/index.html
 create mode 100644 htdocs/includes/OAuth/Common/AutoLoader.php
 create mode 100644 htdocs/includes/OAuth/Common/Consumer/Credentials.php
 create mode 100644 htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Exception/Exception.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Uri/Uri.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Service/AbstractService.php
 create mode 100644 htdocs/includes/OAuth/Common/Service/ServiceInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/DoliStorage.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Memory.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Redis.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/Session.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/SymfonySession.php
 create mode 100644 htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
 create mode 100644 htdocs/includes/OAuth/Common/Token/AbstractToken.php
 create mode 100644 htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
 create mode 100644 htdocs/includes/OAuth/Common/Token/TokenInterface.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Etsy.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/FitBit.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Flickr.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Redmine.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Twitter.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Xing.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Signature/Signature.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
 create mode 100644 htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Amazon.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Bitly.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Box.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Buffer.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Delicious.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Facebook.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/GitHub.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Google.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Harvest.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Heroku.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Hubic.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Instagram.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Nest.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Paypal.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Pocket.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Reddit.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Spotify.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Strava.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Ustream.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Service/Yammer.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
 create mode 100644 htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
 create mode 100644 htdocs/includes/OAuth/ServiceFactory.php
 create mode 100644 htdocs/includes/OAuth/bootstrap.php
 create mode 100644 htdocs/langs/en_US/oauth.lang

diff --git a/.tx/config b/.tx/config
index 03301ded378..06607e62894 100644
--- a/.tx/config
+++ b/.tx/config
@@ -218,6 +218,12 @@ source_file = htdocs/langs/en_US/members.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.oauth]
+file_filter = htdocs/langs/<lang>/oauth.lang
+source_file = htdocs/langs/en_US/oauth.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.opensurvey]
 file_filter = htdocs/langs/<lang>/opensurvey.lang
 source_file = htdocs/langs/en_US/opensurvey.lang
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
new file mode 100644
index 00000000000..517b4eeb8e9
--- /dev/null
+++ b/htdocs/admin/oauth.php
@@ -0,0 +1,335 @@
+<?php
+/* 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/>.
+ *
+ */
+
+/**
+ * \file        htdocs/admin/oauth.php
+ * \ingroup     oauth
+ * \brief       Setup page to configure oauth access api
+ */
+
+require '../main.inc.php';
+
+// required Class
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+
+$langs->load("admin");
+$langs->load("oauth");
+
+// Security check
+if (!$user->admin)
+    accessforbidden();
+
+$action = GETPOST('action', 'alpha');
+
+// API access parameters OAUTH
+$list = array (
+            array(
+                'OAUTH_AMAZON_NAME',
+                'OAUTH_AMAZON_ID',
+                'OAUTH_AMAZON_SECRET',
+            ),
+            array(
+                'OAUTH_BITBUCKET_NAME',
+                'OAUTH_BITBUCKET_ID',
+                'OAUTH_BITBUCKET_SECRET',
+            ),
+            array(
+                'OAUTH_BITLY_NAME',
+                'OAUTH_BITLY_ID',
+                'OAUTH_BITLY_SECRET',
+            ),
+            array(
+                'OAUTH_BITRIX24_NAME',
+                'OAUTH_BITRIX24_ID',
+                'OAUTH_BITRIX24_SECRET',
+            ),
+            array(
+                'OAUTH_BOX_NAME',
+                'OAUTH_BOX_ID',
+                'OAUTH_BOX_SECRET',
+            ),
+            array(
+                'OAUTH_BUFFER_NAME',
+                'OAUTH_BUFFER_ID',
+                'OAUTH_BUFFER_SECRET',
+            ),
+            array(
+                'OAUTH_DAILYMOTION_NAME',
+                'OAUTH_DAILYMOTION_ID',
+                'OAUTH_DAILYMOTION_SECRET',
+            ),
+            array(
+                'OAUTH_DEVIANTART_NAME',
+                'OAUTH_DEVIANTART_ID',
+                'OAUTH_DEVIANTART_SECRET',
+            ),
+            array(
+                'OAUTH_DROPBOX_NAME',
+                'OAUTH_DROPBOX_ID',
+                'OAUTH_DROPBOX_SECRET',
+            ),
+            array(
+                'OAUTH_ETSY_NAME',
+                'OAUTH_ETSY_ID',
+                'OAUTH_ETSY_SECRET',
+            ),
+            array(
+                'OAUTH_EVEONLINE_NAME',
+                'OAUTH_EVEONLINE_ID',
+                'OAUTH_EVEONLINE_SECRET',
+            ),
+            array(
+                'OAUTH_FACEBOOK_NAME',
+                'OAUTH_FACEBOOK_ID',
+                'OAUTH_FACEBOOK_SECRET',
+            ),
+            array(
+                'OAUTH_FITBIT_NAME',
+                'OAUTH_FITBIT_ID',
+                'OAUTH_FITBIT_SECRET',
+            ),
+            array(
+                'OAUTH_FIVEHUNDREDPX_NAME',
+                'OAUTH_FIVEHUNDREDPX_ID',
+                'OAUTH_FIVEHUNDREDPX_SECRET',
+            ),
+            array(
+                'OAUTH_FLICKR_NAME',
+                'OAUTH_FLICKR_ID',
+                'OAUTH_FLICKR_SECRET',
+            ),
+            array(
+                'OAUTH_FOURSQUARE_NAME',
+                'OAUTH_FOURSQUARE_ID',
+                'OAUTH_FOURSQUARE_SECRET',
+            ),
+            array(
+                'OAUTH_GITHUB_NAME',
+                'OAUTH_GITHUB_ID',
+                'OAUTH_GITHUB_SECRET',
+            ),
+            array(
+                'OAUTH_GOOGLE_NAME',
+                'OAUTH_GOOGLE_ID',
+                'OAUTH_GOOGLE_SECRET',
+            ),
+            array(
+                'OAUTH_HUBIC_NAME',
+                'OAUTH_HUBIC_ID',
+                'OAUTH_HUBIC_SECRET',
+            ),
+            array(
+                'OAUTH_INSTAGRAM_NAME',
+                'OAUTH_INSTAGRAM_ID',
+                'OAUTH_INSTAGRAM_SECRET',
+            ),
+            array(
+                'OAUTH_LINKEDIN_NAME',
+                'OAUTH_LINKEDIN_ID',
+                'OAUTH_LINKEDIN_SECRET',
+            ),
+            array(
+                'OAUTH_MAILCHIMP_NAME',
+                'OAUTH_MAILCHIMP_ID',
+                'OAUTH_MAILCHIMP_SECRET',
+            ),
+            array(
+                'OAUTH_MICROSOFT_NAME',
+                'OAUTH_MICROSOFT_ID',
+                'OAUTH_MICROSOFT_SECRET',
+            ),
+            array(
+                'OAUTH_NEST_NAME',
+                'OAUTH_NEST_ID',
+                'OAUTH_NEST_SECRET',
+            ),
+            array(
+                'OAUTH_NETATMO_NAME',
+                'OAUTH_NETATMO_ID',
+                'OAUTH_NETATMO_SECRET',
+            ),
+            array(
+                'OAUTH_PARROTFLOWERPOWER_NAME',
+                'OAUTH_PARROTFLOWERPOWER_ID',
+                'OAUTH_PARROTFLOWERPOWER_SECRET',
+            ),
+            array(
+                'OAUTH_PAYPAL_NAME',
+                'OAUTH_PAYPAL_ID',
+                'OAUTH_PAYPAL_SECRET',
+            ),
+            array(
+                'OAUTH_POCKET_NAME',
+                'OAUTH_POCKET_ID',
+                'OAUTH_POCKET_SECRET',
+            ),
+            array(
+                'OAUTH_QUICKBOOKS_NAME',
+                'OAUTH_QUICKBOOKS_ID',
+                'OAUTH_QUICKBOOKS_SECRET',
+            ),
+            array(
+                'OAUTH_REDDIT_NAME',
+                'OAUTH_REDDIT_ID',
+                'OAUTH_REDDIT_SECRET',
+            ),
+            array(
+                'OAUTH_REDMINE_NAME',
+                'OAUTH_REDMINE_ID',
+                'OAUTH_REDMINE_SECRET',
+            ),
+            array(
+                'OAUTH_RUNKEEPER_NAME',
+                'OAUTH_RUNKEEPER_ID',
+                'OAUTH_RUNKEEPER_SECRET',
+            ),
+            array(
+                'OAUTH_SCOOPIT_NAME',
+                'OAUTH_SCOOPIT_ID',
+                'OAUTH_SCOOPIT_SECRET',
+            ),
+            array(
+                'OAUTH_SOUNDCLOUD_NAME',
+                'OAUTH_SOUNDCLOUD_ID',
+                'OAUTH_SOUNDCLOUD_SECRET',
+            ),
+            array(
+                'OAUTH_SPOTIFY_NAME',
+                'OAUTH_SPOTIFY_ID',
+                'OAUTH_SPOTIFY_SECRET',
+            ),
+            array(
+                'OAUTH_STRAVA_NAME',
+                'OAUTH_STRAVA_ID',
+                'OAUTH_STRAVA_SECRET',
+            ),
+            array(
+                'OAUTH_TUMBLR_NAME',
+                'OAUTH_TUMBLR_ID',
+                'OAUTH_TUMBLR_SECRET',
+            ),
+            array(
+                'OAUTH_TWITTER_NAME',
+                'OAUTH_TWITTER_ID',
+                'OAUTH_TWITTER_SECRET',
+            ),
+            array(
+                'OAUTH_USTREAM_NAME',
+                'OAUTH_USTREAM_ID',
+                'OAUTH_USTREAM_SECRET',
+            ),
+            array(
+                'OAUTH_VIMEO_NAME',
+                'OAUTH_VIMEO_ID',
+                'OAUTH_VIMEO_SECRET',
+            ),
+            array(
+                'OAUTH_YAHOO_NAME',
+                'OAUTH_YAHOO_ID',
+                'OAUTH_YAHOO_SECRET',
+            ),
+            array(
+                'OAUTH_YAMMER_NAME',
+                'OAUTH_YAMMER_ID',
+                'OAUTH_YAMMER_SECRET',
+            ),
+);
+
+
+/*
+ * Actions
+ */
+ 
+if ($action == 'update')
+{
+    $error = 0;
+
+    foreach ($list as $constname) {
+        $constvalue = GETPOST($constname[1], 'alpha');
+        if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity))
+            $error++;
+        $constvalue = GETPOST($constname[2], 'alpha');
+        if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity))
+            $error++;
+    }
+
+    if (! $error)
+    {
+        setEventMessage($langs->trans("SetupSaved"));
+    } else {
+        setEventMessage($langs->trans("Error"),'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('ConfigOAuth'),$linkback,'title_setup');
+
+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">';
+
+/*
+ *  Parameters
+ */
+dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
+
+print '<table class="noborder" width="100%">';
+
+$var = true;
+
+foreach ($list as $key)
+{
+    print '<tr class="liste_titre">';
+    // Api Name
+    $label = $langs->trans($key[0]); 
+    print '<td colspan="2">'.$label.'</td></tr>';
+
+    // Api Id
+    $var = !$var;
+    print '<tr '.$bc[$var].' class="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 '<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>';
+
+}
+
+print '</tr>';
+
+print '</form>';
+print '</table>'."\n";
+
+print '<br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+dol_fiche_end();
+
+llxFooter();
+$db->close();
\ No newline at end of file
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 431ac89a94e..e447722fc67 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -46,11 +46,12 @@ if ($action == 'print_file' and $user->rights->printing->read)
 
             if (! empty($conf->global->{$printer->active})) {
                 $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
-                $errorprint = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
-                //if ($errorprint < 0) {
-                //    setEventMessage($interface->errors, 'errors');
-                //}
-                if ($errorprint=='') {
+                $ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
+                if ($ret < 0) {
+                    setEventMessage($printer->error, 'errors');
+                }
+                if ($ret==0) {
+                    setEventMessage($printer->error, 'warning');
                     setEventMessage($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name);
                     $printed++;
                 }
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
new file mode 100644
index 00000000000..9320e45b0b9
--- /dev/null
+++ b/htdocs/core/modules/modOauth.class.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2014-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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/>.
+ */
+
+/** \defgroup   oauth     Module oauth
+ *  \brief      Module for activation of Oauth for several Api Access
+ */
+
+/**
+ *  \file       htdocs/core/modules/modOauth.class.php
+ *  \ingroup    oauth
+ *  \brief      File of class to describe and activate module Oauth
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+
+/**
+ *  Class to describe and activate module Direct Printing
+ */
+class modOauth extends DolibarrModules
+{
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB      $db      Database handler
+     */
+    function  __construct($db)
+    {
+        $this->db = $db ;
+        $this->numero = 66000;
+        // 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Enable Oauth.";
+        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $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.
+        // 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 = 'technic';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
+
+        // Config pages
+        $this->config_page_url = array("oauth.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(5,1);                     // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->conflictwith = array();
+        $this->langfiles = array("oauth");
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'oauth';
+
+        $r=0;
+        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
+        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+        // $this->rights[$r][2]     Non utilise
+        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+
+        $r++;
+        $this->rights[$r][0] = 66001;
+        $this->rights[$r][1] = 'OauthAccess';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 1;
+        $this->rights[$r][4] = 'read';
+
+        // Main menu entries
+        $this->menus = array();         // List of menus to add
+        $r=0;
+
+        // This is to declare the Top Menu entry:
+        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
+        //                        'type'=>'left',                 // This is a Top menu entry
+        //                        'titre'=>'MenuOauth',
+        //                        'mainmenu'=>'oauth',
+        //                        'url'=>'/oauth/index.php',
+        //                        'langs'=>'oauth',            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+        //                        'position'=>300,
+        //                        'enabled'=>'$conf->oauth->enabled && $leftmenu==\'modulesadmintools\'',
+        //                        'perms'=>'$user->rights->oauth->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
+
+        //$r++;
+
+
+    }
+}
diff --git a/htdocs/core/modules/oauth/getgoogleoauthcallback.php b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
new file mode 100644
index 00000000000..82d83aa1e44
--- /dev/null
+++ b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ *      \file       htdocs/core/modules/oauth/getoauthcallback.php
+ *      \ingroup    oauth
+ *      \brief      Page to get oauth callback
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+use OAuth\Common\Storage\Session;
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\OAuth2\Service\Google;
+
+/**
+ * Create a new instance of the URI class with the current URI, stripping the query string
+ */
+$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
+$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
+$currentUri->setQuery('');
+
+/**
+ * Load the credential for the service
+ */
+
+/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+$serviceFactory = new \OAuth\ServiceFactory();
+// Dolibarr storage
+$storage = new DoliStorage($db, $conf);
+// Setup the credentials for the requests
+$credentials = new Credentials(
+    $conf->global->OAUTH_GOOGLE_ID,
+    $conf->global->OAUTH_GOOGLE_SECRET,
+    $currentUri->getAbsoluteUri()
+);
+
+// Instantiate the Api service using the credentials, http client and storage mechanism for the token
+/** @var $apiService Service */
+// TODO remove hardcoded array
+$apiService = $serviceFactory->createService('Google', $credentials, $storage, array('userinfo_email', 'userinfo_profile', 'cloud_print'));
+
+// access type needed for google refresh token
+$apiService->setAccessType('offline');
+//print '<pre>'.print_r($apiService,true).'</pre>';
+//print 'Has access Token: '.($storage->hasAccessToken('Google')?'Yes':'No').'</ br>';
+//print 'Has Author State: '.($storage->hasAuthorizationState('Google')?'Yes':'No').'</ br>';
+//print 'Authorization State: '.$storage->retrieveAuthorizationState('Google').'</ br>';
+//print '<td><pre>'.print_r($token,true).'</pre></td>';
+if (! empty($_GET['code'])) {
+    llxHeader('',$langs->trans("OAuthSetup"));
+
+    $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+    print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+    // retrieve the CSRF state parameter
+    $state = isset($_GET['state']) ? $_GET['state'] : null;
+    try {
+        //$token = $storage->retrieveAccessToken('Google');
+    } catch (Exception $e) {
+        print $e->getMessage();
+    }
+    //print '<pre>'.print_r($token->getRefreshToken(),true).'</pre>';
+    //$refreshtoken = $token->getRefreshToken();
+    // This was a callback request from service, get the token
+    $apiService->requestAccessToken($_GET['code'], $state);
+    //print '<pre>'.print_r($apiService,true).'</pre>';
+
+    try {
+        $token = $storage->retrieveAccessToken('Google');
+    } catch (Exception $e) {
+        print $e->getMessage();
+    }
+    $newrefreshtoken = $token->getRefreshToken();
+    if (empty($newrefreshtoken) && ! empty($refreshtoken)) {
+        $token->setRefreshToken($refreshtoken);
+        $storage->storeAccessToken('Google', $token);
+    }
+    print '<td><pre>'.print_r($token,true).'</pre></td>';
+    //$apiService->refreshAccessToken($token);
+    //print '<pre>'.print_r($apiService,true).'</pre>';
+    //$token = $storage->retrieveAccessToken('Google');
+    //print '<td><pre>'.print_r($token,true).'</pre></td>';
+
+} else {
+    $url = $apiService->getAuthorizationUri();
+    // we go on google authorization page
+    header('Location: ' . $url);
+    exit();
+}
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/core/modules/oauth/index.html b/htdocs/core/modules/oauth/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index 7bb9ac98f58..4a6560b47fa 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014 Frederic France      <frederic.france@free.fr>
+ * 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
@@ -56,8 +56,8 @@ class PrintingDriver
     {
         global $conf;
 
-        $type='printing';
-        $liste=array();
+        $type = 'printing';
+        $list = array();
 
         $moduledir=DOL_DOCUMENT_ROOT."/core/modules/printing/";
         $tmpfiles=dol_dir_list($moduledir,'all',0,'\modules.php','','name',SORT_ASC,0);
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index b32eece2e1a..d7f44ae243f 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014 Frederic France      <frederic.france@free.fr>
+ * 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
@@ -24,6 +24,11 @@
  */
 
 include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+use OAuth\Common\Storage\Session;
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+use OAuth\OAuth2\Service\Google;
 
 /**
  *     Class to provide printing with Google Cloud Print
@@ -35,14 +40,13 @@ class printing_printgcp extends PrintingDriver
     var $picto = 'printer';
     var $active = 'PRINTING_PRINTGCP';
     var $conf = array();
-    var $login = '';
-    var $password = '';
-    var $authtoken = '';
+    var $google_id = '';
+    var $google_secret = '';
     var $db;
 
-    const LOGIN_URL = 'https://www.google.com/accounts/ClientLogin';
-    const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/interface/search';
-    const PRINT_URL = 'https://www.google.com/cloudprint/interface/submit';
+    const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
+    const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
+    const PRINT_URL = 'https://www.google.com/cloudprint/submit';
 
     /**
      *  Constructor
@@ -54,11 +58,66 @@ class printing_printgcp extends PrintingDriver
         global $conf;
 
         $this->db = $db;
-        $this->login = $conf->global->PRINTGCP_LOGIN;
-        $this->password = $conf->global->PRINTGCP_PASSWORD;
-        $this->authtoken = $conf->global->PRINTGCP_AUTHTOKEN;
-        $this->conf[] = array('varname'=>'PRINTGCP_LOGIN', 'required'=>1, 'example'=>'user@gmail.com', 'type'=>'text');
-        $this->conf[] = array('varname'=>'PRINTGCP_PASSWORD', 'required'=>1, 'example'=>'', 'type'=>'password');
+        $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
+        $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+        // Token storage
+        $storage = new DoliStorage($this->db, $this->conf);
+        //$storage->clearToken('Google');
+        // Setup the credentials for the requests
+        $credentials = new Credentials(
+            $this->google_id,
+            $this->google_secret,
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+        );
+        $access = ($storage->hasAccessToken('Google')?'HasAccessToken':'NoAccessToken');
+        $serviceFactory = new \OAuth\ServiceFactory();
+        $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());
+        $token_ok=true;
+        try {
+            $token = $storage->retrieveAccessToken('Google');
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $token_ok = false;
+        }
+        $expire = false;
+        // Is token expired or will token expire in the next 30 seconds
+        if ($token_ok) {
+            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+        }
+
+        // Token expired so we refresh it
+        if ($token_ok && $expire) {
+            try {
+                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+                $refreshtoken = $token->getRefreshToken();
+                $token = $apiService->refreshAccessToken($token);
+                $token->setRefreshToken($refreshtoken);
+                $storage->storeAccessToken('Google', $token);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+                print '<pre>MissingRefreshToken: '.$e->getMessage().'</pre>';
+                //print '<pre>'.print_r($e,true).'</pre>';
+            }
+        }
+        if (!$conf->oauth->enabled) {
+            $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'ModuleAuthNotActive', 'type'=>'info');
+        } else {
+            if ($this->google_id != '' && $this->google_secret != '') {
+                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
+                $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info');
+                if ($token_ok) {
+                    $refreshtoken = $token->getRefreshToken();
+                    $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH', 'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
+                    $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info');
+                    $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(date("Y-m-d H:i:s", $token->getEndOfLife())), 'type'=>'info');
+                }
+                $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+            } else {
+                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
+            }
+        }
+        // do not display submit button
+        $this->conf[] = array('enabled'=>0, 'type'=>'submit');
     }
 
     /**
@@ -111,48 +170,71 @@ class printing_printgcp extends PrintingDriver
         return $html;
     }
 
+
     /**
      *  Return list of available printers
      *
-     *  @return array                list of printers
+     *  @return array      list of printers
      */
     function getlist_available_printers()
     {
-        global $conf,$db;
-        if ($this->authtoken=='') {
-            $this->GoogleLogin();
-        }
-        $ret['available'] = $this->get_printer_detail();
-        return $ret;
-    }
-
-    /**
-     *  List of printers
-     *
-     *  @return array      list of printers
-     */
-    function get_printer_detail()
-    {
+        // Token storage
+        $storage = new DoliStorage($this->db, $this->conf);
+        // Setup the credentials for the requests
+        $credentials = new Credentials(
+            $this->google_id,
+            $this->google_secret,
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+        );
+        $serviceFactory = new \OAuth\ServiceFactory();
+        $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());
         // Check if we have auth token
-        if(empty($this->authtoken)) {
-            // We don't have auth token so throw exception
-            throw new Exception("Please first login to Google by calling loginToGoogle function");
+        $token_ok=true;
+        try {
+            $token = $storage->retrieveAccessToken('Google');
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $token_ok = false;
         }
-        // Prepare auth headers with auth token
-        $authheaders = array("Authorization: GoogleLogin auth=".$this->authtoken,
-                             "GData-Version: 3.0",
-                            );
-        // Make Http call to get printers added by user to Google Cloud Print
-        $responsedata = $this->makeCurl(self::PRINTERS_SEARCH_URL,array(),$authheaders);
-        $printers = json_decode($responsedata);
+        $expire = false;
+        // Is token expired or will token expire in the next 30 seconds
+        if ($token_ok) {
+            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+        }
+
+        // Token expired so we refresh it
+        if ($token_ok && $expire) {
+            try {
+                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+                $refreshtoken = $token->getRefreshToken();
+                $token = $apiService->refreshAccessToken($token);
+                $token->setRefreshToken($refreshtoken);
+                $storage->storeAccessToken('Google', $token);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+                print '<pre>MissingRefreshToken: '.$e->getMessage().'</pre>';
+                //print '<pre>'.print_r($e,true).'</pre>';
+            }
+        }
+        // Send a request with api
+        try {
+            $response = $apiService->request(self::PRINTERS_SEARCH_URL);
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            print '<pre>'.print_r($e->getMessage(),true).'</pre>';
+        }
+        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+        $responsedata = json_decode($response, true);
+        $printers = $responsedata['printers'];
         // Check if we have printers?
-        if(is_null($printers)) {
+        if(count($printers)==0) {
             // We dont have printers so return blank array
-            return array();
+            $ret['available'] =  array();
         } else {
             // We have printers so returns printers as array
-            return $this->parsePrinters($printers);
+            $ret['available'] =  $printers;
         }
+        return $ret;
     }
 
     /**
@@ -161,14 +243,11 @@ class printing_printgcp extends PrintingDriver
      * @param   string      $file       file
      * @param   string      $module     module
      * @param   string      $subdir     subdir for file
-     * @return  string                  '' if OK, Error message if KO
+     * @return  int                     0 if OK, <0 if KO
      */
     function print_file($file, $module, $subdir='')
     {
         global $conf, $user, $db;
-        if ($this->authtoken=='') {
-            $this->GoogleLogin();
-        }
         // si $module=commande_fournisseur alors $conf->fournisseur->commande->dir_output
         $fileprint=$conf->{$module}->dir_output;
         if ($subdir!='') $fileprint.='/'.$subdir;
@@ -181,7 +260,7 @@ class printing_printgcp extends PrintingDriver
             $obj = $this->db->fetch_object($result);
             if ($obj)
             {
-                $printer_id=$obj->printer_id;
+                $printer_id = $obj->printer_id;
             }
             else
             {
@@ -197,7 +276,12 @@ class printing_printgcp extends PrintingDriver
         }
         else dol_print_error($db);
 
-        $this->sendPrintToPrinter($printer_id, $file, $fileprint, 'application/pdf');
+        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, 'application/pdf');
+        $this->error = 'PRINTGCP: '.$ret['errormessage'];
+        if ($ret['status']==1) 
+            return 0;
+        else
+            return -1;
     }
 
     /**
@@ -209,24 +293,16 @@ class printing_printgcp extends PrintingDriver
      *  @param  string      $contenttype    File content type by example application/pdf, image/png
      *  @return array                       status array
      */
-    public function sendPrintToPrinter($printerid,$printjobtitle,$filepath,$contenttype)
+    public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
     {
-        $errors=0;
-        // Check auth token
-        if(empty($this->authtoken)) {
-            $errors++;
-            setEventMessage('Please first login to Google', 'warning');
-        }
         // Check if printer id
         if(empty($printerid)) {
-            $errors++;
-            setEventMessage('No provided printer ID', 'warning');
+            return array('status' =>0, 'errorcode' =>'','errormessage'=>'No provided printer ID');
         }
         // Open the file which needs to be print
         $handle = fopen($filepath, "rb");
         if(!$handle) {
-            $errors++;
-            setEventMessage('Could not read the file.');
+            return array('status' =>0, 'errorcode' =>'','errormessage'=>'Could not read the file.');
         }
         // Read file content
         $contents = fread($handle, filesize($filepath));
@@ -238,118 +314,41 @@ class printing_printgcp extends PrintingDriver
                              'content' => base64_encode($contents), // encode file content as base64
                              'contentType' => $contenttype
                             );
-        // Prepare authorization headers
-        $authheaders = array("Authorization: GoogleLogin auth=" . $this->authtoken);
-        // Make http call for sending print Job
-        $response = json_decode($this->makeCurl(self::PRINT_URL,$post_fields,$authheaders));
-        // Has document been successfully sent?
-        if($response->success=="1") {
-            return array('status' =>true,'errorcode' =>'','errormessage'=>"");
-        } else {
-            return array('status' =>false,'errorcode' =>$response->errorCode,'errormessage'=>$response->message);
+        // Token storage
+        $storage = new DoliStorage($this->db, $this->conf);
+        // Setup the credentials for the requests
+        $credentials = new Credentials(
+            $this->google_id,
+            $this->google_secret,
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getoauthcallback.php?service=google'
+        );
+        $serviceFactory = new \OAuth\ServiceFactory();
+        $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());
+
+        // Check if we have auth token and refresh it
+        $token_ok=true;
+        try {
+            $token = $storage->retrieveAccessToken('Google');
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $token_ok = false;
         }
-    }
-
-
-    /**
-     *  Login into Google Account
-     *
-     *  @return boolean           true or false
-     */
-    function GoogleLogin()
-    {
-        global $db, $conf;
-        // Prepare post fields required for the login
-        $loginpostfields = array("accountType" => "HOSTED_OR_GOOGLE",
-                                 "Email" => $this->login,
-                                 "Passwd" => $this->password,
-                                 "service" => "cloudprint",
-                                 "source" => "GCP"
-                                );
-        // Get the Auth token
-        $loginresponse = $this->makeCurl(self::LOGIN_URL,$loginpostfields);
-        $token = $this->getAuthToken($loginresponse);
-        if(! empty($token)&&!is_null($token)) {
-            $this->authtoken = $token;
-            $result=dolibarr_set_const($db, 'PRINTGCP_AUTHTOKEN', $token, 'chaine', 0, '', $conf->entity);
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-    /**
-     *  Parse json response and return printers array
-     *
-     *  @param  string    $jsonobj  Json response object
-     *  @return array               return array of printers
-     */
-    private function parsePrinters($jsonobj)
-    {
-        $printers = array();
-        if (isset($jsonobj->printers)) {
-            foreach ($jsonobj->printers as $gcpprinter) {
-                $printers[] = array('id' =>$gcpprinter->id,
-                                    'name' =>$gcpprinter->name,
-                                    'defaultDisplayName' =>$gcpprinter->defaultDisplayName,
-                                    'displayName' =>$gcpprinter->displayName,
-                                    'ownerId' =>$gcpprinter->ownerId,
-                                    'ownerName' =>$gcpprinter->ownerName,
-                                    'connectionStatus' =>$gcpprinter->connectionStatus,
-                                    'status' =>$gcpprinter->status,
-                                    'type' =>$gcpprinter->type
-                                    );
+        if ($token_ok) {
+            try {
+                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+                $refreshtoken = $token->getRefreshToken();
+                $token = $apiService->refreshAccessToken($token);
+                $token->setRefreshToken($refreshtoken);
+                $storage->storeAccessToken('Google', $token);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
             }
         }
-        return $printers;
-    }
 
-    /**
-     *  Parse data to get auth token
-     *
-     *  @param      string  $response   response from curl
-     *  @return     string              token
-     */
-    private function getAuthToken($response)
-    {
-        // Search Auth tag
-        preg_match("/Auth=([a-z0-9_-]+)/i", $response, $matches);
-        $authtoken = @$matches[1];
-        return $authtoken;
+        // Send a request with api
+        $response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
+        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+        return array('status' =>$response['success'],'errorcode' =>$response['errorCode'],'errormessage'=>$response['message']);
     }
 
-    /**
-     *  Make a curl request
-     *
-     *  @param  string  	$url            url to hit
-     *  @param  array   	$postfields     array of post fields
-     *  @param  string[]   	$headers        array of http headers
-     *  @return string                   	response from curl
-     */
-    private function makeCurl($url, $postfields=array(), $headers=array())
-    {
-        // Curl Init
-        $curl = curl_init($url);
-        // Curl post request
-        if(! empty($postfields)) {
-            // As is HTTP post curl request so set post fields
-            curl_setopt($curl, CURLOPT_POST, true);
-            curl_setopt($curl, CURLOPT_POSTFIELDS, $postfields);
-        }
-        // Curl request headers
-        if(! empty($headers)) {
-            // As curl requires header so set headers here
-            curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-        }
-        curl_setopt($curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-        curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-        // Execute the curl and return response
-        $response = curl_exec($curl);
-        curl_close($curl);
-        return $response;
-    }
-
-
 }
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 3fbb66fb088..56cd4c3b2b6 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014 Frederic France      <frederic.france@free.fr>
+ * 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
@@ -62,6 +62,7 @@ class printing_printipp extends PrintingDriver
         $this->conf[] = array('varname'=>'PRINTIPP_PORT', 'required'=>1, 'example'=>'631', 'type'=>'text');
         $this->conf[] = array('varname'=>'PRINTIPP_USER', 'required'=>0, 'example'=>'', 'type'=>'text', 'moreattributes'=>'autocomplete="off"');
         $this->conf[] = array('varname'=>'PRINTIPP_PASSWORD', 'required'=>0, 'example'=>'', 'type'=>'password', 'moreattributes'=>'autocomplete="off"');
+        $this->conf[] = array('enabled'=>1, 'type'=>'submit');
     }
 
     /**
@@ -71,7 +72,7 @@ class printing_printipp extends PrintingDriver
      * @param   string      $module     module
      * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
      *
-     * @return  string                  '' if OK, Error message if KO
+     * @return  int                     0 if OK, <0 if KO
      */
     function print_file($file, $module, $subdir='')
     {
@@ -107,7 +108,8 @@ class printing_printipp extends PrintingDriver
                 }
                 else
 				{
-                    return 'NoDefaultPrinterDefined';
+                    $this->error = 'NoDefaultPrinterDefined';
+                    return -1;
                 }
             }
         }
@@ -121,7 +123,7 @@ class printing_printipp extends PrintingDriver
         $ipp->setData($fileprint);
         $ipp->printJob();
 
-        return '';
+        return 0;
     }
 
     /**
diff --git a/htdocs/includes/OAuth/Common/AutoLoader.php b/htdocs/includes/OAuth/Common/AutoLoader.php
new file mode 100644
index 00000000000..9fe7951cbd3
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/AutoLoader.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace OAuth\Common;
+
+/**
+ * PSR-0 Autoloader
+ *
+ * @author ieter Hordijk <info@pieterhordijk.com>
+ */
+class AutoLoader
+{
+    /**
+     * @var string The namespace prefix for this instance.
+     */
+    protected $namespace = '';
+
+    /**
+     * @var string The filesystem prefix to use for this instance
+     */
+    protected $path = '';
+
+    /**
+     * Build the instance of the autoloader
+     *
+     * @param string $namespace The prefixed namespace this instance will load
+     * @param string $path      The filesystem path to the root of the namespace
+     */
+    public function __construct($namespace, $path)
+    {
+        $this->namespace = ltrim($namespace, '\\');
+        $this->path      = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Try to load a class
+     *
+     * @param string $class The class name to load
+     *
+     * @return boolean If the loading was successful
+     */
+    public function load($class)
+    {
+        $class = ltrim($class, '\\');
+
+        if (strpos($class, $this->namespace) === 0) {
+            $nsparts   = explode('\\', $class);
+            $class     = array_pop($nsparts);
+            $nsparts[] = '';
+            $path      = $this->path . implode(DIRECTORY_SEPARATOR, $nsparts);
+            $path     .= str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
+
+            if (file_exists($path)) {
+                require $path;
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Register the autoloader to PHP
+     *
+     * @return boolean The status of the registration
+     */
+    public function register()
+    {
+        return spl_autoload_register(array($this, 'load'));
+    }
+
+    /**
+     * Unregister the autoloader to PHP
+     *
+     * @return boolean The status of the unregistration
+     */
+    public function unregister()
+    {
+        return spl_autoload_unregister(array($this, 'load'));
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Consumer/Credentials.php b/htdocs/includes/OAuth/Common/Consumer/Credentials.php
new file mode 100644
index 00000000000..8e98e9fa9a6
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Consumer/Credentials.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace OAuth\Common\Consumer;
+
+/**
+ * Value object for the credentials of an OAuth service.
+ */
+class Credentials implements CredentialsInterface
+{
+    /**
+     * @var string
+     */
+    protected $consumerId;
+
+    /**
+     * @var string
+     */
+    protected $consumerSecret;
+
+    /**
+     * @var string
+     */
+    protected $callbackUrl;
+
+    /**
+     * @param string $consumerId
+     * @param string $consumerSecret
+     * @param string $callbackUrl
+     */
+    public function __construct($consumerId, $consumerSecret, $callbackUrl)
+    {
+        $this->consumerId = $consumerId;
+        $this->consumerSecret = $consumerSecret;
+        $this->callbackUrl = $callbackUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCallbackUrl()
+    {
+        return $this->callbackUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getConsumerId()
+    {
+        return $this->consumerId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getConsumerSecret()
+    {
+        return $this->consumerSecret;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php b/htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
new file mode 100644
index 00000000000..a33e54e9ee2
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Consumer/CredentialsInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace OAuth\Common\Consumer;
+
+/**
+ * Credentials Interface, credentials should implement this.
+ */
+interface CredentialsInterface
+{
+    /**
+     * @return string
+     */
+    public function getCallbackUrl();
+
+    /**
+     * @return string
+     */
+    public function getConsumerId();
+
+    /**
+     * @return string
+     */
+    public function getConsumerSecret();
+}
diff --git a/htdocs/includes/OAuth/Common/Exception/Exception.php b/htdocs/includes/OAuth/Common/Exception/Exception.php
new file mode 100644
index 00000000000..2e39921729c
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Exception/Exception.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace OAuth\Common\Exception;
+
+/**
+ * Generic library-level exception.
+ */
+class Exception extends \Exception
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php b/htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
new file mode 100644
index 00000000000..94000b18ce6
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Client/AbstractClient.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace OAuth\Common\Http\Client;
+
+/**
+ * Abstract HTTP client
+ */
+abstract class AbstractClient implements ClientInterface
+{
+    /**
+     * @var string The user agent string passed to services
+     */
+    protected $userAgent;
+
+    /**
+     * @var int The maximum number of redirects
+     */
+    protected $maxRedirects = 5;
+
+    /**
+     * @var int The maximum timeout
+     */
+    protected $timeout = 15;
+
+    /**
+     * Creates instance
+     *
+     * @param string $userAgent The UA string the client will use
+     */
+    public function __construct($userAgent = 'PHPoAuthLib')
+    {
+        $this->userAgent = $userAgent;
+    }
+
+    /**
+     * @param int $redirects Maximum redirects for client
+     *
+     * @return ClientInterface
+     */
+    public function setMaxRedirects($redirects)
+    {
+        $this->maxRedirects = $redirects;
+
+        return $this;
+    }
+
+    /**
+     * @param int $timeout Request timeout time for client in seconds
+     *
+     * @return ClientInterface
+     */
+    public function setTimeout($timeout)
+    {
+        $this->timeout = $timeout;
+
+        return $this;
+    }
+
+    /**
+     * @param array $headers
+     */
+    public function normalizeHeaders(&$headers)
+    {
+        // Normalize headers
+        array_walk(
+            $headers,
+            function (&$val, &$key) {
+                $key = ucfirst(strtolower($key));
+                $val = ucfirst(strtolower($key)) . ': ' . $val;
+            }
+        );
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php b/htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
new file mode 100644
index 00000000000..f9c20226a6d
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Client/ClientInterface.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace OAuth\Common\Http\Client;
+
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+
+/**
+ * Any HTTP clients to be used with the library should implement this interface.
+ */
+interface ClientInterface
+{
+    /**
+     * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
+     * They should return, in string form, the response body and throw an exception on error.
+     *
+     * @param UriInterface $endpoint
+     * @param mixed        $requestBody
+     * @param array        $extraHeaders
+     * @param string       $method
+     *
+     * @return string
+     *
+     * @throws TokenResponseException
+     */
+    public function retrieveResponse(
+        UriInterface $endpoint,
+        $requestBody,
+        array $extraHeaders = array(),
+        $method = 'POST'
+    );
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Client/CurlClient.php b/htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
new file mode 100644
index 00000000000..eae1be3ed05
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Client/CurlClient.php
@@ -0,0 +1,142 @@
+<?php
+
+namespace OAuth\Common\Http\Client;
+
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Client implementation for cURL
+ */
+class CurlClient extends AbstractClient
+{
+    /**
+     * If true, explicitly sets cURL to use SSL version 3. Use this if cURL
+     * compiles with GnuTLS SSL.
+     *
+     * @var bool
+     */
+    private $forceSSL3 = false;
+
+    /**
+     * Additional parameters (as `key => value` pairs) to be passed to `curl_setopt`
+     *
+     * @var array
+     */
+    private $parameters = array();
+
+    /**
+     * Additional `curl_setopt` parameters
+     *
+     * @param array $parameters
+     */
+    public function setCurlParameters(array $parameters)
+    {
+        $this->parameters = $parameters;
+    }
+
+    /**
+     * @param bool $force
+     *
+     * @return CurlClient
+     */
+    public function setForceSSL3($force)
+    {
+        $this->forceSSL3 = $force;
+
+        return $this;
+    }
+
+    /**
+     * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
+     * They should return, in string form, the response body and throw an exception on error.
+     *
+     * @param UriInterface $endpoint
+     * @param mixed        $requestBody
+     * @param array        $extraHeaders
+     * @param string       $method
+     *
+     * @return string
+     *
+     * @throws TokenResponseException
+     * @throws \InvalidArgumentException
+     */
+    public function retrieveResponse(
+        UriInterface $endpoint,
+        $requestBody,
+        array $extraHeaders = array(),
+        $method = 'POST'
+    ) {
+        // Normalize method name
+        $method = strtoupper($method);
+
+        $this->normalizeHeaders($extraHeaders);
+
+        if ($method === 'GET' && !empty($requestBody)) {
+            throw new \InvalidArgumentException('No body expected for "GET" request.');
+        }
+
+        if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
+            $extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
+        }
+
+        $extraHeaders['Host']       = 'Host: '.$endpoint->getHost();
+        $extraHeaders['Connection'] = 'Connection: close';
+
+        $ch = curl_init();
+
+        curl_setopt($ch, CURLOPT_URL, $endpoint->getAbsoluteUri());
+
+        if ($method === 'POST' || $method === 'PUT') {
+            if ($requestBody && is_array($requestBody)) {
+                $requestBody = http_build_query($requestBody, '', '&');
+            }
+
+            if ($method === 'PUT') {
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+            } else {
+                curl_setopt($ch, CURLOPT_POST, true);
+            }
+
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $requestBody);
+        } else {
+            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+        }
+
+        if ($this->maxRedirects > 0) {
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->maxRedirects);
+        }
+
+        curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_HEADER, false);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $extraHeaders);
+        curl_setopt($ch, CURLOPT_USERAGENT, $this->userAgent);
+
+        foreach ($this->parameters as $key => $value) {
+            curl_setopt($ch, $key, $value);
+        }
+
+        if ($this->forceSSL3) {
+            curl_setopt($ch, CURLOPT_SSLVERSION, 3);
+        }
+
+        $response     = curl_exec($ch);
+        $responseCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+        if (false === $response) {
+            $errNo  = curl_errno($ch);
+            $errStr = curl_error($ch);
+            curl_close($ch);
+            if (empty($errStr)) {
+                throw new TokenResponseException('Failed to request resource.', $responseCode);
+            }
+            throw new TokenResponseException('cURL Error # '.$errNo.': '.$errStr, $responseCode);
+        }
+
+        curl_close($ch);
+
+        return $response;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Client/StreamClient.php b/htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
new file mode 100644
index 00000000000..d81fee88202
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Client/StreamClient.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace OAuth\Common\Http\Client;
+
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Client implementation for streams/file_get_contents
+ */
+class StreamClient extends AbstractClient
+{
+    /**
+     * Any implementing HTTP providers should send a request to the provided endpoint with the parameters.
+     * They should return, in string form, the response body and throw an exception on error.
+     *
+     * @param UriInterface $endpoint
+     * @param mixed        $requestBody
+     * @param array        $extraHeaders
+     * @param string       $method
+     *
+     * @return string
+     *
+     * @throws TokenResponseException
+     * @throws \InvalidArgumentException
+     */
+    public function retrieveResponse(
+        UriInterface $endpoint,
+        $requestBody,
+        array $extraHeaders = array(),
+        $method = 'POST'
+    ) {
+        // Normalize method name
+        $method = strtoupper($method);
+
+        $this->normalizeHeaders($extraHeaders);
+
+        if ($method === 'GET' && !empty($requestBody)) {
+            throw new \InvalidArgumentException('No body expected for "GET" request.');
+        }
+
+        if (!isset($extraHeaders['Content-Type']) && $method === 'POST' && is_array($requestBody)) {
+            $extraHeaders['Content-Type'] = 'Content-Type: application/x-www-form-urlencoded';
+        }
+
+        $host = 'Host: '.$endpoint->getHost();
+        // Append port to Host if it has been specified
+        if ($endpoint->hasExplicitPortSpecified()) {
+            $host .= ':'.$endpoint->getPort();
+        }
+
+        $extraHeaders['Host']       = $host;
+        $extraHeaders['Connection'] = 'Connection: close';
+
+        if (is_array($requestBody)) {
+            $requestBody = http_build_query($requestBody, '', '&');
+        }
+        $extraHeaders['Content-length'] = 'Content-length: '.strlen($requestBody);
+
+        $context = $this->generateStreamContext($requestBody, $extraHeaders, $method);
+
+        $level = error_reporting(0);
+        $response = file_get_contents($endpoint->getAbsoluteUri(), false, $context);
+        error_reporting($level);
+        if (false === $response) {
+            $lastError = error_get_last();
+            if (is_null($lastError)) {
+                throw new TokenResponseException(
+                    'Failed to request resource. HTTP Code: ' .
+                    ((isset($http_response_header[0]))?$http_response_header[0]:'No response')
+                );
+            }
+            throw new TokenResponseException($lastError['message']);
+        }
+
+        return $response;
+    }
+
+    private function generateStreamContext($body, $headers, $method)
+    {
+        return stream_context_create(
+            array(
+                'http' => array(
+                    'method'           => $method,
+                    'header'           => implode("\r\n", array_values($headers)),
+                    'content'          => $body,
+                    'protocol_version' => '1.1',
+                    'user_agent'       => $this->userAgent,
+                    'max_redirects'    => $this->maxRedirects,
+                    'timeout'          => $this->timeout
+                ),
+            )
+        );
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php b/htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
new file mode 100644
index 00000000000..c519a223b3d
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Exception/TokenResponseException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OAuth\Common\Http\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Exception relating to token response from service.
+ */
+class TokenResponseException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/Uri.php b/htdocs/includes/OAuth/Common/Http/Uri/Uri.php
new file mode 100644
index 00000000000..c5114937d77
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Uri/Uri.php
@@ -0,0 +1,408 @@
+<?php
+
+namespace OAuth\Common\Http\Uri;
+
+use InvalidArgumentException;
+
+/**
+ * Standards-compliant URI class.
+ */
+class Uri implements UriInterface
+{
+    /**
+     * @var string
+     */
+    private $scheme = 'http';
+
+    /**
+     * @var string
+     */
+    private $userInfo = '';
+
+    /**
+     * @var string
+     */
+    private $rawUserInfo = '';
+
+    /**
+     * @var string
+     */
+    private $host;
+
+    /**
+     * @var int
+     */
+    private $port = 80;
+
+    /**
+     * @var string
+     */
+    private $path = '/';
+
+    /**
+     * @var string
+     */
+    private $query = '';
+
+    /**
+     * @var string
+     */
+    private $fragment = '';
+
+    /**
+     * @var bool
+     */
+    private $explicitPortSpecified = false;
+
+    /**
+     * @var bool
+     */
+    private $explicitTrailingHostSlash = false;
+
+    /**
+     * @param string $uri
+     */
+    public function __construct($uri = null)
+    {
+        if (null !== $uri) {
+            $this->parseUri($uri);
+        }
+    }
+
+    /**
+     * @param string $uri
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function parseUri($uri)
+    {
+        if (false === ($uriParts = parse_url($uri))) {
+            // congratulations if you've managed to get parse_url to fail,
+            // it seems to always return some semblance of a parsed url no matter what
+            throw new InvalidArgumentException("Invalid URI: $uri");
+        }
+
+        if (!isset($uriParts['scheme'])) {
+            throw new InvalidArgumentException('Invalid URI: http|https scheme required');
+        }
+
+        $this->scheme = $uriParts['scheme'];
+        $this->host = $uriParts['host'];
+
+        if (isset($uriParts['port'])) {
+            $this->port = $uriParts['port'];
+            $this->explicitPortSpecified = true;
+        } else {
+            $this->port = strcmp('https', $uriParts['scheme']) ? 80 : 443;
+            $this->explicitPortSpecified = false;
+        }
+
+        if (isset($uriParts['path'])) {
+            $this->path = $uriParts['path'];
+            if ('/' === $uriParts['path']) {
+                $this->explicitTrailingHostSlash = true;
+            }
+        } else {
+            $this->path = '/';
+        }
+
+        $this->query = isset($uriParts['query']) ? $uriParts['query'] : '';
+        $this->fragment = isset($uriParts['fragment']) ? $uriParts['fragment'] : '';
+
+        $userInfo = '';
+        if (!empty($uriParts['user'])) {
+            $userInfo .= $uriParts['user'];
+        }
+        if ($userInfo && !empty($uriParts['pass'])) {
+            $userInfo .= ':' . $uriParts['pass'];
+        }
+
+        $this->setUserInfo($userInfo);
+    }
+
+    /**
+     * @param string $rawUserInfo
+     *
+     * @return string
+     */
+    protected function protectUserInfo($rawUserInfo)
+    {
+        $colonPos = strpos($rawUserInfo, ':');
+
+        // rfc3986-3.2.1 | http://tools.ietf.org/html/rfc3986#section-3.2
+        // "Applications should not render as clear text any data
+        // after the first colon (":") character found within a userinfo
+        // subcomponent unless the data after the colon is the empty string
+        // (indicating no password)"
+        if ($colonPos !== false && strlen($rawUserInfo)-1 > $colonPos) {
+            return substr($rawUserInfo, 0, $colonPos) . ':********';
+        } else {
+            return $rawUserInfo;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUserInfo()
+    {
+        return $this->userInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRawUserInfo()
+    {
+        return $this->rawUserInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * Uses protected user info by default as per rfc3986-3.2.1
+     * Uri::getRawAuthority() is available if plain-text password information is desirable.
+     *
+     * @return string
+     */
+    public function getAuthority()
+    {
+        $authority = $this->userInfo ? $this->userInfo.'@' : '';
+        $authority .= $this->host;
+
+        if ($this->explicitPortSpecified) {
+            $authority .= ":{$this->port}";
+        }
+
+        return $authority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRawAuthority()
+    {
+        $authority = $this->rawUserInfo ? $this->rawUserInfo.'@' : '';
+        $authority .= $this->host;
+
+        if ($this->explicitPortSpecified) {
+            $authority .= ":{$this->port}";
+        }
+
+        return $authority;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAbsoluteUri()
+    {
+        $uri = $this->scheme . '://' . $this->getRawAuthority();
+
+        if ('/' === $this->path) {
+            $uri .= $this->explicitTrailingHostSlash ? '/' : '';
+        } else {
+            $uri .= $this->path;
+        }
+
+        if (!empty($this->query)) {
+            $uri .= "?{$this->query}";
+        }
+
+        if (!empty($this->fragment)) {
+            $uri .= "#{$this->fragment}";
+        }
+
+        return $uri;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelativeUri()
+    {
+        $uri = '';
+
+        if ('/' === $this->path) {
+            $uri .= $this->explicitTrailingHostSlash ? '/' : '';
+        } else {
+            $uri .= $this->path;
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Uses protected user info by default as per rfc3986-3.2.1
+     * Uri::getAbsoluteUri() is available if plain-text password information is desirable.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $uri = $this->scheme . '://' . $this->getAuthority();
+
+        if ('/' === $this->path) {
+            $uri .= $this->explicitTrailingHostSlash ? '/' : '';
+        } else {
+            $uri .= $this->path;
+        }
+
+        if (!empty($this->query)) {
+            $uri .= "?{$this->query}";
+        }
+
+        if (!empty($this->fragment)) {
+            $uri .= "#{$this->fragment}";
+        }
+
+        return $uri;
+    }
+
+    /**
+     * @param $path
+     */
+    public function setPath($path)
+    {
+        if (empty($path)) {
+            $this->path = '/';
+            $this->explicitTrailingHostSlash = false;
+        } else {
+            $this->path = $path;
+            if ('/' === $this->path) {
+                $this->explicitTrailingHostSlash = true;
+            }
+        }
+    }
+
+    /**
+     * @param string $query
+     */
+    public function setQuery($query)
+    {
+        $this->query = $query;
+    }
+
+    /**
+     * @param string $var
+     * @param string $val
+     */
+    public function addToQuery($var, $val)
+    {
+        if (strlen($this->query) > 0) {
+            $this->query .= '&';
+        }
+        $this->query .= http_build_query(array($var => $val), '', '&');
+    }
+
+    /**
+     * @param string $fragment
+     */
+    public function setFragment($fragment)
+    {
+        $this->fragment = $fragment;
+    }
+
+    /**
+     * @param string $scheme
+     */
+    public function setScheme($scheme)
+    {
+        $this->scheme = $scheme;
+    }
+
+
+    /**
+     * @param string $userInfo
+     */
+    public function setUserInfo($userInfo)
+    {
+        $this->userInfo = $userInfo ? $this->protectUserInfo($userInfo) : '';
+        $this->rawUserInfo = $userInfo;
+    }
+
+
+    /**
+     * @param int $port
+     */
+    public function setPort($port)
+    {
+        $this->port = intval($port);
+
+        if (('https' === $this->scheme && $this->port === 443) || ('http' === $this->scheme && $this->port === 80)) {
+            $this->explicitPortSpecified = false;
+        } else {
+            $this->explicitPortSpecified = true;
+        }
+    }
+
+    /**
+     * @param string $host
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitTrailingHostSlash()
+    {
+        return $this->explicitTrailingHostSlash;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitPortSpecified()
+    {
+        return $this->explicitPortSpecified;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php b/htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
new file mode 100644
index 00000000000..127aa203bec
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Uri/UriFactory.php
@@ -0,0 +1,168 @@
+<?php
+
+namespace OAuth\Common\Http\Uri;
+
+use RuntimeException;
+
+/**
+ * Factory class for uniform resource indicators
+ */
+class UriFactory implements UriFactoryInterface
+{
+    /**
+     * Factory method to build a URI from a super-global $_SERVER array.
+     *
+     * @param array $_server
+     *
+     * @return UriInterface
+     */
+    public function createFromSuperGlobalArray(array $_server)
+    {
+        if ($uri = $this->attemptProxyStyleParse($_server)) {
+            return $uri;
+        }
+
+        $scheme = $this->detectScheme($_server);
+        $host = $this->detectHost($_server);
+        $port = $this->detectPort($_server);
+        $path = $this->detectPath($_server);
+        $query = $this->detectQuery($_server);
+
+        return $this->createFromParts($scheme, '', $host, $port, $path, $query);
+    }
+
+    /**
+     * @param string $absoluteUri
+     *
+     * @return UriInterface
+     */
+    public function createFromAbsolute($absoluteUri)
+    {
+        return new Uri($absoluteUri);
+    }
+
+    /**
+     * Factory method to build a URI from parts
+     *
+     * @param string $scheme
+     * @param string $userInfo
+     * @param string $host
+     * @param string $port
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     *
+     * @return UriInterface
+     */
+    public function createFromParts($scheme, $userInfo, $host, $port, $path = '', $query = '', $fragment = '')
+    {
+        $uri = new Uri();
+        $uri->setScheme($scheme);
+        $uri->setUserInfo($userInfo);
+        $uri->setHost($host);
+        $uri->setPort($port);
+        $uri->setPath($path);
+        $uri->setQuery($query);
+        $uri->setFragment($fragment);
+
+        return $uri;
+    }
+
+    /**
+     * @param array $_server
+     *
+     * @return UriInterface|null
+     */
+    private function attemptProxyStyleParse($_server)
+    {
+        // If the raw HTTP request message arrives with a proxy-style absolute URI in the
+        // initial request line, the absolute URI is stored in $_SERVER['REQUEST_URI'] and
+        // we only need to parse that.
+        if (isset($_server['REQUEST_URI']) && parse_url($_server['REQUEST_URI'], PHP_URL_SCHEME)) {
+            return new Uri($_server['REQUEST_URI']);
+        }
+
+        return null;
+    }
+
+    /**
+     * @param array $_server
+     *
+     * @return string
+     *
+     * @throws RuntimeException
+     */
+    private function detectPath($_server)
+    {
+        if (isset($_server['REQUEST_URI'])) {
+            $uri = $_server['REQUEST_URI'];
+        } elseif (isset($_server['REDIRECT_URL'])) {
+            $uri = $_server['REDIRECT_URL'];
+        } else {
+            throw new RuntimeException('Could not detect URI path from superglobal');
+        }
+
+        $queryStr = strpos($uri, '?');
+        if ($queryStr !== false) {
+            $uri = substr($uri, 0, $queryStr);
+        }
+
+        return $uri;
+    }
+
+    /**
+     * @param array $_server
+     *
+     * @return string
+     */
+    private function detectHost(array $_server)
+    {
+        $host = isset($_server['HTTP_HOST']) ? $_server['HTTP_HOST'] : '';
+
+        if (strstr($host, ':')) {
+            $host = parse_url($host, PHP_URL_HOST);
+        }
+
+        return $host;
+    }
+
+    /**
+     * @param array $_server
+     *
+     * @return string
+     */
+    private function detectPort(array $_server)
+    {
+        return isset($_server['SERVER_PORT']) ? $_server['SERVER_PORT'] : 80;
+    }
+
+    /**
+     * @param array $_server
+     *
+     * @return string
+     */
+    private function detectQuery(array $_server)
+    {
+        return isset($_server['QUERY_STRING']) ? $_server['QUERY_STRING'] : '';
+    }
+
+    /**
+     * Determine URI scheme component from superglobal array
+     *
+     * When using ISAPI with IIS, the value will be "off" if the request was
+     * not made through the HTTPS protocol. As a result, we filter the
+     * value to a bool.
+     *
+     * @param array $_server A super-global $_SERVER array
+     *
+     * @return string Returns http or https depending on the URI scheme
+     */
+    private function detectScheme(array $_server)
+    {
+        if (isset($_server['HTTPS']) && filter_var($_server['HTTPS'], FILTER_VALIDATE_BOOLEAN)) {
+            return 'https';
+        } else {
+            return 'http';
+        }
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php b/htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
new file mode 100644
index 00000000000..2b157d841aa
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Uri/UriFactoryInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace OAuth\Common\Http\Uri;
+
+/**
+ * Factory interface for uniform resource indicators
+ */
+interface UriFactoryInterface
+{
+    /**
+     * Factory method to build a URI from a super-global $_SERVER array.
+     *
+     * @param array $_server
+     *
+     * @return UriInterface
+     */
+    public function createFromSuperGlobalArray(array $_server);
+
+    /**
+     * Creates a URI from an absolute URI
+     *
+     * @param string $absoluteUri
+     *
+     * @return UriInterface
+     */
+    public function createFromAbsolute($absoluteUri);
+
+    /**
+     * Factory method to build a URI from parts
+     *
+     * @param string $scheme
+     * @param string $userInfo
+     * @param string $host
+     * @param string $port
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     *
+     * @return UriInterface
+     */
+    public function createFromParts($scheme, $userInfo, $host, $port, $path = '', $query = '', $fragment = '');
+}
diff --git a/htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php b/htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
new file mode 100644
index 00000000000..008d4647ae5
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Http/Uri/UriInterface.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace OAuth\Common\Http\Uri;
+
+interface UriInterface
+{
+    /**
+     * @return string
+     */
+    public function getScheme();
+
+    /**
+     * @param string $scheme
+     */
+    public function setScheme($scheme);
+
+    /**
+     * @return string
+     */
+    public function getHost();
+
+    /**
+     * @param string $host
+     */
+    public function setHost($host);
+
+    /**
+     * @return int
+     */
+    public function getPort();
+
+    /**
+     * @param int $port
+     */
+    public function setPort($port);
+
+    /**
+     * @return string
+     */
+    public function getPath();
+
+    /**
+     * @param string $path
+     */
+    public function setPath($path);
+
+    /**
+     * @return string
+     */
+    public function getQuery();
+
+    /**
+     * @param string $query
+     */
+    public function setQuery($query);
+
+    /**
+     * Adds a param to the query string.
+     *
+     * @param string $var
+     * @param string $val
+     */
+    public function addToQuery($var, $val);
+
+    /**
+     * @return string
+     */
+    public function getFragment();
+
+    /**
+     * Should return URI user info, masking protected user info data according to rfc3986-3.2.1
+     *
+     * @return string
+     */
+    public function getUserInfo();
+
+    /**
+     * @param string $userInfo
+     */
+    public function setUserInfo($userInfo);
+
+    /**
+     * Should return the URI Authority, masking protected user info data according to rfc3986-3.2.1
+     *
+     * @return string
+     */
+    public function getAuthority();
+
+    /**
+     * Should return the URI string, masking protected user info data according to rfc3986-3.2.1
+     *
+     * @return string the URI string with user protected info masked
+     */
+    public function __toString();
+
+    /**
+     * Should return the URI Authority without masking protected user info data
+     *
+     * @return string
+     */
+    public function getRawAuthority();
+
+    /**
+     * Should return the URI user info without masking protected user info data
+     *
+     * @return string
+     */
+    public function getRawUserInfo();
+
+    /**
+     * Build the full URI based on all the properties
+     *
+     * @return string The full URI without masking user info
+     */
+    public function getAbsoluteUri();
+
+    /**
+     * Build the relative URI based on all the properties
+     *
+     * @return string The relative URI
+     */
+    public function getRelativeUri();
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitTrailingHostSlash();
+
+    /**
+     * @return bool
+     */
+    public function hasExplicitPortSpecified();
+}
diff --git a/htdocs/includes/OAuth/Common/Service/AbstractService.php b/htdocs/includes/OAuth/Common/Service/AbstractService.php
new file mode 100644
index 00000000000..0bf572b4af5
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Service/AbstractService.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace OAuth\Common\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Exception\Exception;
+use OAuth\Common\Storage\TokenStorageInterface;
+
+/**
+ * Abstract OAuth service, version-agnostic
+ */
+abstract class AbstractService implements ServiceInterface
+{
+    /** @var Credentials */
+    protected $credentials;
+
+    /** @var ClientInterface */
+    protected $httpClient;
+
+    /** @var TokenStorageInterface */
+    protected $storage;
+
+    /**
+     * @param CredentialsInterface  $credentials
+     * @param ClientInterface       $httpClient
+     * @param TokenStorageInterface $storage
+     */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage
+    ) {
+        $this->credentials = $credentials;
+        $this->httpClient = $httpClient;
+        $this->storage = $storage;
+    }
+
+    /**
+     * @param UriInterface|string $path
+     * @param UriInterface        $baseApiUri
+     *
+     * @return UriInterface
+     *
+     * @throws Exception
+     */
+    protected function determineRequestUriFromPath($path, UriInterface $baseApiUri = null)
+    {
+        if ($path instanceof UriInterface) {
+            $uri = $path;
+        } elseif (stripos($path, 'http://') === 0 || stripos($path, 'https://') === 0) {
+            $uri = new Uri($path);
+        } else {
+            if (null === $baseApiUri) {
+                throw new Exception(
+                    'An absolute URI must be passed to ServiceInterface::request as no baseApiUri is set.'
+                );
+            }
+
+            $uri = clone $baseApiUri;
+            if (false !== strpos($path, '?')) {
+                $parts = explode('?', $path, 2);
+                $path = $parts[0];
+                $query = $parts[1];
+                $uri->setQuery($query);
+            }
+
+            if ($path[0] === '/') {
+                $path = substr($path, 1);
+            }
+
+            $uri->setPath($uri->getPath() . $path);
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Accessor to the storage adapter to be able to retrieve tokens
+     *
+     * @return TokenStorageInterface
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * @return string
+     */
+    public function service()
+    {
+        // get class name without backslashes
+        $classname = get_class($this);
+
+        return preg_replace('/^.*\\\\/', '', $classname);
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Service/ServiceInterface.php b/htdocs/includes/OAuth/Common/Service/ServiceInterface.php
new file mode 100644
index 00000000000..5856a03947c
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Service/ServiceInterface.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace OAuth\Common\Service;
+
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Defines methods common among all OAuth services.
+ */
+interface ServiceInterface
+{
+    /**
+     * Sends an authenticated API request to the path provided.
+     * If the path provided is not an absolute URI, the base API Uri (service-specific) will be used.
+     *
+     * @param string|UriInterface $path
+     * @param string              $method       HTTP method
+     * @param array               $body         Request body if applicable (an associative array will
+     *                                          automatically be converted into a urlencoded body)
+     * @param array               $extraHeaders Extra headers if applicable. These will override service-specific
+     *                                          any defaults.
+     *
+     * @return string
+     */
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array());
+
+    /**
+     * Returns the url to redirect to for authorization purposes.
+     *
+     * @param array $additionalParameters
+     *
+     * @return UriInterface
+     */
+    public function getAuthorizationUri(array $additionalParameters = array());
+
+    /**
+     * Returns the authorization API endpoint.
+     *
+     * @return UriInterface
+     */
+    public function getAuthorizationEndpoint();
+
+    /**
+     * Returns the access token API endpoint.
+     *
+     * @return UriInterface
+     */
+    public function getAccessTokenEndpoint();
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
new file mode 100644
index 00000000000..7a46d106e66
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -0,0 +1,254 @@
+<?php
+/*
+ * 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/>.
+ */
+
+/**
+ *      \file       htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+ *      \ingroup    oauth
+ *      \brief      Dolibarr token storage class
+ */
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
+use DoliDB;
+
+class DoliStorage implements TokenStorageInterface
+{
+    /**
+     * @var DoliDB Database handler
+     */
+    protected $db;
+
+    /**
+     * @var object|TokenInterface
+     */
+    protected $tokens;
+
+    /**
+     * @var string Error code (or message)
+     */
+    public $error;
+    /**
+     * @var string[] Several error codes (or messages)
+     */
+    public $errors = array();
+
+    private $conf;
+    private $key;
+    private $stateKey;
+
+    /**
+     * @param Conf   $conf
+     * @param string $key
+     * @param string $stateKey
+     */
+    public function __construct(DoliDB $db, $conf)
+    {
+        $this->db = $db;
+        $this->conf = $conf;
+        $this->tokens = array();
+        $this->states = array();
+        //$this->key = $key;
+        //$this->stateKey = $stateKey;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAccessToken($service)
+    {
+        if ($this->hasAccessToken($service)) {
+            return $this->tokens[$service];
+        }
+
+        throw new TokenNotFoundException('Token not found in db, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAccessToken($service, TokenInterface $token)
+    {
+        $serializedToken = serialize($token);
+        $this->tokens[$service] = $token;
+
+        if (!is_array($this->tokens)) {
+            $this->tokens = array();
+        }
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
+        $sql.= " WHERE service='".$service."' AND entity=1";
+        $resql = $this->db->query($sql);
+        $obj = $this->db->fetch_array($resql);
+        if ($obj) {
+            // update
+            $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+            $sql.= " SET token='".$this->db->escape($serializedToken)."'";
+            $sql.= " WHERE rowid='".$obj['rowid']."'";
+            $resql = $this->db->query($sql);
+        } else {
+            // save
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, token, entity)";
+            $sql.= " VALUES ('".$service."', '".$this->db->escape($serializedToken)."', 1)";
+            $resql = $this->db->query($sql);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccessToken($service)
+    {
+        // get from db
+        $sql = "SELECT token FROM ".MAIN_DB_PREFIX."oauth_token";
+        $sql.= " WHERE service='".$service."'";
+        $resql = $this->db->query($sql);
+        $result = $this->db->fetch_array($resql);
+        $token = unserialize($result[token]);
+        $this->tokens[$service] = $token;
+
+        return is_array($this->tokens)
+            && isset($this->tokens[$service])
+            && $this->tokens[$service] instanceof TokenInterface;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearToken($service)
+    {
+        // TODO
+        // get previously saved tokens
+        $tokens = $this->session->get($this->key);
+
+        if (is_array($tokens) && array_key_exists($service, $tokens)) {
+            unset($tokens[$service]);
+
+            // Replace the stored tokens array
+            $this->conf->set($this->key, $tokens);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllTokens()
+    {
+        // TODO
+        $this->conf->remove($this->key);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAuthorizationState($service)
+    {
+        if ($this->hasAuthorizationState($service)) {
+            return $this->states[$service];
+
+        }
+
+        throw new AuthorizationStateNotFoundException('State not found in conf, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAuthorizationState($service, $state)
+    {
+        // TODO save or update
+        // get previously saved tokens
+        //$states = $this->conf->get($this->stateKey);
+
+        if (!is_array($states)) {
+            $states = array();
+        }
+
+        $states[$service] = $state;
+        $this->states[$service] = $state;
+
+        // save
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_state (service, state, entity)";
+        $sql.= " VALUES ('".$service."', '".$state."', 1)";
+        $resql = $this->db->query($sql);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAuthorizationState($service)
+    {
+        // get from db
+        $sql = "SELECT state FROM ".MAIN_DB_PREFIX."oauth_state";
+        $sql.= " WHERE service='".$service."'";
+        $resql = $this->db->query($sql);
+        $result = $this->db->fetch_array($resql);
+        $states[$service] = $result[state];
+        $this->states[$service] = $states[$service];
+
+        return is_array($states)
+        && isset($states[$service])
+        && null !== $states[$service];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAuthorizationState($service)
+    {
+        // TODO
+        // get previously saved tokens
+        //$states = $this->conf->get($this->stateKey);
+
+        if (is_array($states) && array_key_exists($service, $states)) {
+            unset($states[$service]);
+
+            // Replace the stored tokens array
+            //$this->conf->set($this->stateKey, $states);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllAuthorizationStates()
+    {
+        // TODO
+        //$this->conf->remove($this->stateKey);
+
+        // allow chaining
+        return $this;
+    }
+
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php b/htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
new file mode 100644
index 00000000000..b3daeabb72e
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Exception/AuthorizationStateNotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace OAuth\Common\Storage\Exception;
+
+/**
+ * Exception thrown when a state is not found in storage.
+ */
+class AuthorizationStateNotFoundException extends StorageException
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php b/htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
new file mode 100644
index 00000000000..4378ee8fde3
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Exception/StorageException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OAuth\Common\Storage\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Generic storage exception.
+ */
+class StorageException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php b/htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
new file mode 100644
index 00000000000..06222508d5b
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Exception/TokenNotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace OAuth\Common\Storage\Exception;
+
+/**
+ * Exception thrown when a token is not found in storage.
+ */
+class TokenNotFoundException extends StorageException
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Memory.php b/htdocs/includes/OAuth/Common/Storage/Memory.php
new file mode 100644
index 00000000000..d42c225191c
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Memory.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
+
+/*
+ * Stores a token in-memory only (destroyed at end of script execution).
+ */
+class Memory implements TokenStorageInterface
+{
+    /**
+     * @var object|TokenInterface
+     */
+    protected $tokens;
+
+    /**
+     * @var array
+     */
+    protected $states;
+
+    public function __construct()
+    {
+        $this->tokens = array();
+        $this->states = array();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAccessToken($service)
+    {
+        if ($this->hasAccessToken($service)) {
+            return $this->tokens[$service];
+        }
+
+        throw new TokenNotFoundException('Token not stored');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAccessToken($service, TokenInterface $token)
+    {
+        $this->tokens[$service] = $token;
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccessToken($service)
+    {
+        return isset($this->tokens[$service]) && $this->tokens[$service] instanceof TokenInterface;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearToken($service)
+    {
+        if (array_key_exists($service, $this->tokens)) {
+            unset($this->tokens[$service]);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllTokens()
+    {
+        $this->tokens = array();
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAuthorizationState($service)
+    {
+        if ($this->hasAuthorizationState($service)) {
+            return $this->states[$service];
+        }
+
+        throw new AuthorizationStateNotFoundException('State not stored');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAuthorizationState($service, $state)
+    {
+        $this->states[$service] = $state;
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAuthorizationState($service)
+    {
+        return isset($this->states[$service]) && null !== $this->states[$service];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAuthorizationState($service)
+    {
+        if (array_key_exists($service, $this->states)) {
+            unset($this->states[$service]);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllAuthorizationStates()
+    {
+        $this->states = array();
+
+        // allow chaining
+        return $this;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Redis.php b/htdocs/includes/OAuth/Common/Storage/Redis.php
new file mode 100644
index 00000000000..5d3d9aea006
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Redis.php
@@ -0,0 +1,230 @@
+<?php
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
+use Predis\Client as Predis;
+
+/*
+ * Stores a token in a Redis server. Requires the Predis library available at https://github.com/nrk/predis
+ */
+class Redis implements TokenStorageInterface
+{
+    /**
+     * @var string
+     */
+    protected $key;
+
+    protected $stateKey;
+
+    /**
+     * @var object|\Redis
+     */
+    protected $redis;
+
+    /**
+     * @var object|TokenInterface
+     */
+    protected $cachedTokens;
+
+    /**
+     * @var object
+     */
+    protected $cachedStates;
+
+    /**
+     * @param Predis $redis An instantiated and connected redis client
+     * @param string $key The key to store the token under in redis
+     * @param string $stateKey The key to store the state under in redis.
+     */
+    public function __construct(Predis $redis, $key, $stateKey)
+    {
+        $this->redis = $redis;
+        $this->key = $key;
+        $this->stateKey = $stateKey;
+        $this->cachedTokens = array();
+        $this->cachedStates = array();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAccessToken($service)
+    {
+        if (!$this->hasAccessToken($service)) {
+            throw new TokenNotFoundException('Token not found in redis');
+        }
+
+        if (isset($this->cachedTokens[$service])) {
+            return $this->cachedTokens[$service];
+        }
+
+        $val = $this->redis->hget($this->key, $service);
+
+        return $this->cachedTokens[$service] = unserialize($val);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAccessToken($service, TokenInterface $token)
+    {
+        // (over)write the token
+        $this->redis->hset($this->key, $service, serialize($token));
+        $this->cachedTokens[$service] = $token;
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccessToken($service)
+    {
+        if (isset($this->cachedTokens[$service])
+            && $this->cachedTokens[$service] instanceof TokenInterface
+        ) {
+            return true;
+        }
+
+        return $this->redis->hexists($this->key, $service);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearToken($service)
+    {
+        $this->redis->hdel($this->key, $service);
+        unset($this->cachedTokens[$service]);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllTokens()
+    {
+        // memory
+        $this->cachedTokens = array();
+
+        // redis
+        $keys = $this->redis->hkeys($this->key);
+        $me = $this; // 5.3 compat
+
+        // pipeline for performance
+        $this->redis->pipeline(
+            function ($pipe) use ($keys, $me) {
+                foreach ($keys as $k) {
+                    $pipe->hdel($me->getKey(), $k);
+                }
+            }
+        );
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAuthorizationState($service)
+    {
+        if (!$this->hasAuthorizationState($service)) {
+            throw new AuthorizationStateNotFoundException('State not found in redis');
+        }
+
+        if (isset($this->cachedStates[$service])) {
+            return $this->cachedStates[$service];
+        }
+
+        $val = $this->redis->hget($this->stateKey, $service);
+
+        return $this->cachedStates[$service] = $val;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAuthorizationState($service, $state)
+    {
+        // (over)write the token
+        $this->redis->hset($this->stateKey, $service, $state);
+        $this->cachedStates[$service] = $state;
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAuthorizationState($service)
+    {
+        if (isset($this->cachedStates[$service])
+            && null !== $this->cachedStates[$service]
+        ) {
+            return true;
+        }
+
+        return $this->redis->hexists($this->stateKey, $service);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAuthorizationState($service)
+    {
+        $this->redis->hdel($this->stateKey, $service);
+        unset($this->cachedStates[$service]);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllAuthorizationStates()
+    {
+        // memory
+        $this->cachedStates = array();
+
+        // redis
+        $keys = $this->redis->hkeys($this->stateKey);
+        $me = $this; // 5.3 compat
+
+        // pipeline for performance
+        $this->redis->pipeline(
+            function ($pipe) use ($keys, $me) {
+                foreach ($keys as $k) {
+                    $pipe->hdel($me->getKey(), $k);
+                }
+            }
+        );
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * @return Predis $redis
+     */
+    public function getRedis()
+    {
+        return $this->redis;
+    }
+
+    /**
+     * @return string $key
+     */
+    public function getKey()
+    {
+        return $this->key;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/Session.php b/htdocs/includes/OAuth/Common/Storage/Session.php
new file mode 100644
index 00000000000..b011d927503
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/Session.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
+
+/**
+ * Stores a token in a PHP session.
+ */
+class Session implements TokenStorageInterface
+{
+    /**
+     * @var bool
+     */
+    protected $startSession;
+
+    /**
+     * @var string
+     */
+    protected $sessionVariableName;
+
+    /**
+     * @var string
+     */
+    protected $stateVariableName;
+
+    /**
+     * @param bool $startSession Whether or not to start the session upon construction.
+     * @param string $sessionVariableName the variable name to use within the _SESSION superglobal
+     * @param string $stateVariableName
+     */
+    public function __construct(
+        $startSession = true,
+        $sessionVariableName = 'lusitanian-oauth-token',
+        $stateVariableName = 'lusitanian-oauth-state'
+    ) {
+        if ($startSession && !isset($_SESSION)) {
+            session_start();
+        }
+
+        $this->startSession = $startSession;
+        $this->sessionVariableName = $sessionVariableName;
+        $this->stateVariableName = $stateVariableName;
+        if (!isset($_SESSION[$sessionVariableName])) {
+            $_SESSION[$sessionVariableName] = array();
+        }
+        if (!isset($_SESSION[$stateVariableName])) {
+            $_SESSION[$stateVariableName] = array();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAccessToken($service)
+    {
+        if ($this->hasAccessToken($service)) {
+            return unserialize($_SESSION[$this->sessionVariableName][$service]);
+        }
+
+        throw new TokenNotFoundException('Token not found in session, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAccessToken($service, TokenInterface $token)
+    {
+        $serializedToken = serialize($token);
+
+        if (isset($_SESSION[$this->sessionVariableName])
+            && is_array($_SESSION[$this->sessionVariableName])
+        ) {
+            $_SESSION[$this->sessionVariableName][$service] = $serializedToken;
+        } else {
+            $_SESSION[$this->sessionVariableName] = array(
+                $service => $serializedToken,
+            );
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccessToken($service)
+    {
+        return isset($_SESSION[$this->sessionVariableName], $_SESSION[$this->sessionVariableName][$service]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearToken($service)
+    {
+        if (array_key_exists($service, $_SESSION[$this->sessionVariableName])) {
+            unset($_SESSION[$this->sessionVariableName][$service]);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllTokens()
+    {
+        unset($_SESSION[$this->sessionVariableName]);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAuthorizationState($service, $state)
+    {
+        if (isset($_SESSION[$this->stateVariableName])
+            && is_array($_SESSION[$this->stateVariableName])
+        ) {
+            $_SESSION[$this->stateVariableName][$service] = $state;
+        } else {
+            $_SESSION[$this->stateVariableName] = array(
+                $service => $state,
+            );
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAuthorizationState($service)
+    {
+        return isset($_SESSION[$this->stateVariableName], $_SESSION[$this->stateVariableName][$service]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAuthorizationState($service)
+    {
+        if ($this->hasAuthorizationState($service)) {
+            return $_SESSION[$this->stateVariableName][$service];
+        }
+
+        throw new AuthorizationStateNotFoundException('State not found in session, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAuthorizationState($service)
+    {
+        if (array_key_exists($service, $_SESSION[$this->stateVariableName])) {
+            unset($_SESSION[$this->stateVariableName][$service]);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllAuthorizationStates()
+    {
+        unset($_SESSION[$this->stateVariableName]);
+
+        // allow chaining
+        return $this;
+    }
+
+    public function __destruct()
+    {
+        if ($this->startSession) {
+            session_write_close();
+        }
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/SymfonySession.php b/htdocs/includes/OAuth/Common/Storage/SymfonySession.php
new file mode 100644
index 00000000000..6c5fbf60b00
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/SymfonySession.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+class SymfonySession implements TokenStorageInterface
+{
+    private $session;
+    private $sessionVariableName;
+    private $stateVariableName;
+
+    /**
+     * @param SessionInterface $session
+     * @param bool $startSession
+     * @param string $sessionVariableName
+     * @param string $stateVariableName
+     */
+    public function __construct(
+        SessionInterface $session,
+        $startSession = true,
+        $sessionVariableName = 'lusitanian_oauth_token',
+        $stateVariableName = 'lusitanian_oauth_state'
+    ) {
+        $this->session = $session;
+        $this->sessionVariableName = $sessionVariableName;
+        $this->stateVariableName = $stateVariableName;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAccessToken($service)
+    {
+        if ($this->hasAccessToken($service)) {
+            // get from session
+            $tokens = $this->session->get($this->sessionVariableName);
+
+            // one item
+            return $tokens[$service];
+        }
+
+        throw new TokenNotFoundException('Token not found in session, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAccessToken($service, TokenInterface $token)
+    {
+        // get previously saved tokens
+        $tokens = $this->session->get($this->sessionVariableName);
+
+        if (!is_array($tokens)) {
+            $tokens = array();
+        }
+
+        $tokens[$service] = $token;
+
+        // save
+        $this->session->set($this->sessionVariableName, $tokens);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAccessToken($service)
+    {
+        // get from session
+        $tokens = $this->session->get($this->sessionVariableName);
+
+        return is_array($tokens)
+            && isset($tokens[$service])
+            && $tokens[$service] instanceof TokenInterface;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearToken($service)
+    {
+        // get previously saved tokens
+        $tokens = $this->session->get($this->sessionVariableName);
+
+        if (is_array($tokens) && array_key_exists($service, $tokens)) {
+            unset($tokens[$service]);
+
+            // Replace the stored tokens array
+            $this->session->set($this->sessionVariableName, $tokens);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllTokens()
+    {
+        $this->session->remove($this->sessionVariableName);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function retrieveAuthorizationState($service)
+    {
+        if ($this->hasAuthorizationState($service)) {
+            // get from session
+            $states = $this->session->get($this->stateVariableName);
+
+            // one item
+            return $states[$service];
+        }
+
+        throw new AuthorizationStateNotFoundException('State not found in session, are you sure you stored it?');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function storeAuthorizationState($service, $state)
+    {
+        // get previously saved tokens
+        $states = $this->session->get($this->stateVariableName);
+
+        if (!is_array($states)) {
+            $states = array();
+        }
+
+        $states[$service] = $state;
+
+        // save
+        $this->session->set($this->stateVariableName, $states);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasAuthorizationState($service)
+    {
+        // get from session
+        $states = $this->session->get($this->stateVariableName);
+
+        return is_array($states)
+        && isset($states[$service])
+        && null !== $states[$service];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAuthorizationState($service)
+    {
+        // get previously saved tokens
+        $states = $this->session->get($this->stateVariableName);
+
+        if (is_array($states) && array_key_exists($service, $states)) {
+            unset($states[$service]);
+
+            // Replace the stored tokens array
+            $this->session->set($this->stateVariableName, $states);
+        }
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clearAllAuthorizationStates()
+    {
+        $this->session->remove($this->stateVariableName);
+
+        // allow chaining
+        return $this;
+    }
+
+    /**
+     * @return Session
+     */
+    public function getSession()
+    {
+        return $this->session;
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php b/htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
new file mode 100644
index 00000000000..46552cee936
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Storage/TokenStorageInterface.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace OAuth\Common\Storage;
+
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Storage\Exception\TokenNotFoundException;
+
+/**
+ * All token storage providers must implement this interface.
+ */
+interface TokenStorageInterface
+{
+    /**
+     * @param string $service
+     *
+     * @return TokenInterface
+     *
+     * @throws TokenNotFoundException
+     */
+    public function retrieveAccessToken($service);
+
+    /**
+     * @param string         $service
+     * @param TokenInterface $token
+     *
+     * @return TokenStorageInterface
+     */
+    public function storeAccessToken($service, TokenInterface $token);
+
+    /**
+     * @param string $service
+     *
+     * @return bool
+     */
+    public function hasAccessToken($service);
+
+    /**
+     * Delete the users token. Aka, log out.
+     *
+     * @param string $service
+     *
+     * @return TokenStorageInterface
+     */
+    public function clearToken($service);
+
+    /**
+     * Delete *ALL* user tokens. Use with care. Most of the time you will likely
+     * want to use clearToken() instead.
+     *
+     * @return TokenStorageInterface
+     */
+    public function clearAllTokens();
+
+    /**
+     * Store the authorization state related to a given service
+     *
+     * @param string $service
+     * @param string $state
+     *
+     * @return TokenStorageInterface
+     */
+    public function storeAuthorizationState($service, $state);
+
+    /**
+     * Check if an authorization state for a given service exists
+     *
+     * @param string $service
+     *
+     * @return bool
+     */
+    public function hasAuthorizationState($service);
+
+    /**
+     * Retrieve the authorization state for a given service
+     *
+     * @param string $service
+     *
+     * @return string
+     */
+    public function retrieveAuthorizationState($service);
+
+    /**
+     * Clear the authorization state of a given service
+     *
+     * @param string $service
+     *
+     * @return TokenStorageInterface
+     */
+    public function clearAuthorizationState($service);
+
+    /**
+     * Delete *ALL* user authorization states. Use with care. Most of the time you will likely
+     * want to use clearAuthorization() instead.
+     *
+     * @return TokenStorageInterface
+     */
+    public function clearAllAuthorizationStates();
+}
diff --git a/htdocs/includes/OAuth/Common/Token/AbstractToken.php b/htdocs/includes/OAuth/Common/Token/AbstractToken.php
new file mode 100644
index 00000000000..7a362473f2b
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Token/AbstractToken.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace OAuth\Common\Token;
+
+/**
+ * Base token implementation for any OAuth version.
+ */
+abstract class AbstractToken implements TokenInterface
+{
+    /**
+     * @var string
+     */
+    protected $accessToken;
+
+    /**
+     * @var string
+     */
+    protected $refreshToken;
+
+    /**
+     * @var int
+     */
+    protected $endOfLife;
+
+    /**
+     * @var array
+     */
+    protected $extraParams = array();
+
+    /**
+     * @param string $accessToken
+     * @param string $refreshToken
+     * @param int    $lifetime
+     * @param array  $extraParams
+     */
+    public function __construct($accessToken = null, $refreshToken = null, $lifetime = null, $extraParams = array())
+    {
+        $this->accessToken = $accessToken;
+        $this->refreshToken = $refreshToken;
+        $this->setLifetime($lifetime);
+        $this->extraParams = $extraParams;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessToken()
+    {
+        return $this->accessToken;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRefreshToken()
+    {
+        return $this->refreshToken;
+    }
+
+    /**
+     * @return int
+     */
+    public function getEndOfLife()
+    {
+        return $this->endOfLife;
+    }
+
+    /**
+     * @param array $extraParams
+     */
+    public function setExtraParams(array $extraParams)
+    {
+        $this->extraParams = $extraParams;
+    }
+
+    /**
+     * @return array
+     */
+    public function getExtraParams()
+    {
+        return $this->extraParams;
+    }
+
+    /**
+     * @param string $accessToken
+     */
+    public function setAccessToken($accessToken)
+    {
+        $this->accessToken = $accessToken;
+    }
+
+    /**
+     * @param int $endOfLife
+     */
+    public function setEndOfLife($endOfLife)
+    {
+        $this->endOfLife = $endOfLife;
+    }
+
+    /**
+     * @param int $lifetime
+     */
+    public function setLifetime($lifetime)
+    {
+        if (0 === $lifetime || static::EOL_NEVER_EXPIRES === $lifetime) {
+            $this->endOfLife = static::EOL_NEVER_EXPIRES;
+        } elseif (null !== $lifetime) {
+            $this->endOfLife = intval($lifetime) + time();
+        } else {
+            $this->endOfLife = static::EOL_UNKNOWN;
+        }
+    }
+
+    /**
+     * @param string $refreshToken
+     */
+    public function setRefreshToken($refreshToken)
+    {
+        $this->refreshToken = $refreshToken;
+    }
+
+    public function isExpired()
+    {
+        return ($this->getEndOfLife() !== TokenInterface::EOL_NEVER_EXPIRES
+        && $this->getEndOfLife() !== TokenInterface::EOL_UNKNOWN
+        && time() > $this->getEndOfLife());
+    }
+}
diff --git a/htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php b/htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
new file mode 100644
index 00000000000..26ad6cc5cb1
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Token/Exception/ExpiredTokenException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OAuth\Common\Token\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Exception thrown when an expired token is attempted to be used.
+ */
+class ExpiredTokenException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/Common/Token/TokenInterface.php b/htdocs/includes/OAuth/Common/Token/TokenInterface.php
new file mode 100644
index 00000000000..84a4109256f
--- /dev/null
+++ b/htdocs/includes/OAuth/Common/Token/TokenInterface.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace OAuth\Common\Token;
+
+/**
+ * Base token interface for any OAuth version.
+ */
+interface TokenInterface
+{
+    /**
+     * Denotes an unknown end of life time.
+     */
+    const EOL_UNKNOWN = -9001;
+
+    /**
+     * Denotes a token which never expires, should only happen in OAuth1.
+     */
+    const EOL_NEVER_EXPIRES = -9002;
+
+    /**
+     * @return string
+     */
+    public function getAccessToken();
+
+    /**
+     * @return int
+     */
+    public function getEndOfLife();
+
+    /**
+     * @return array
+     */
+    public function getExtraParams();
+
+    /**
+     * @param string $accessToken
+     */
+    public function setAccessToken($accessToken);
+
+    /**
+     * @param int $endOfLife
+     */
+    public function setEndOfLife($endOfLife);
+
+    /**
+     * @param int $lifetime
+     */
+    public function setLifetime($lifetime);
+
+    /**
+     * @param array $extraParams
+     */
+    public function setExtraParams(array $extraParams);
+
+    /**
+     * @return string
+     */
+    public function getRefreshToken();
+
+    /**
+     * @param string $refreshToken
+     */
+    public function setRefreshToken($refreshToken);
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/AbstractService.php b/htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
new file mode 100644
index 00000000000..582b46745f2
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/AbstractService.php
@@ -0,0 +1,320 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\TokenInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Service\AbstractService as BaseAbstractService;
+
+abstract class AbstractService extends BaseAbstractService implements ServiceInterface
+{
+    /** @const OAUTH_VERSION */
+    const OAUTH_VERSION = 1;
+
+    /** @var SignatureInterface */
+    protected $signature;
+
+    /** @var UriInterface|null */
+    protected $baseApiUri;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage);
+
+        $this->signature = $signature;
+        $this->baseApiUri = $baseApiUri;
+
+        $this->signature->setHashingAlgorithm($this->getSignatureMethod());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function requestRequestToken()
+    {
+        $authorizationHeader = array('Authorization' => $this->buildAuthorizationHeaderForTokenRequest());
+        $headers = array_merge($authorizationHeader, $this->getExtraOAuthHeaders());
+
+        $responseBody = $this->httpClient->retrieveResponse($this->getRequestTokenEndpoint(), array(), $headers);
+
+        $token = $this->parseRequestTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($additionalParameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function requestAccessToken($token, $verifier, $tokenSecret = null)
+    {
+        if (is_null($tokenSecret)) {
+            $storedRequestToken = $this->storage->retrieveAccessToken($this->service());
+            $tokenSecret = $storedRequestToken->getRequestTokenSecret();
+        }
+        $this->signature->setTokenSecret($tokenSecret);
+
+        $bodyParams = array(
+            'oauth_verifier' => $verifier,
+        );
+
+        $authorizationHeader = array(
+            'Authorization' => $this->buildAuthorizationHeaderForAPIRequest(
+                'POST',
+                $this->getAccessTokenEndpoint(),
+                $this->storage->retrieveAccessToken($this->service()),
+                $bodyParams
+            )
+        );
+
+        $headers = array_merge($authorizationHeader, $this->getExtraOAuthHeaders());
+
+        $responseBody = $this->httpClient->retrieveResponse($this->getAccessTokenEndpoint(), $bodyParams, $headers);
+
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * Refreshes an OAuth1 access token
+     * @param  TokenInterface $token
+     * @return TokenInterface $token
+     */
+    public function refreshAccessToken(TokenInterface $token)
+    {
+    }
+
+    /**
+     * Sends an authenticated API request to the path provided.
+     * If the path provided is not an absolute URI, the base API Uri (must be passed into constructor) will be used.
+     *
+     * @param string|UriInterface $path
+     * @param string              $method       HTTP method
+     * @param array               $body         Request body if applicable (key/value pairs)
+     * @param array               $extraHeaders Extra headers if applicable.
+     *                                          These will override service-specific any defaults.
+     *
+     * @return string
+     */
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $uri = $this->determineRequestUriFromPath($path, $this->baseApiUri);
+
+        /** @var $token StdOAuth1Token */
+        $token = $this->storage->retrieveAccessToken($this->service());
+        $extraHeaders = array_merge($this->getExtraApiHeaders(), $extraHeaders);
+        $authorizationHeader = array(
+            'Authorization' => $this->buildAuthorizationHeaderForAPIRequest($method, $uri, $token, $body)
+        );
+        $headers = array_merge($authorizationHeader, $extraHeaders);
+
+        return $this->httpClient->retrieveResponse($uri, $body, $headers, $method);
+    }
+
+    /**
+     * Return any additional headers always needed for this service implementation's OAuth calls.
+     *
+     * @return array
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array();
+    }
+
+    /**
+     * Return any additional headers always needed for this service implementation's API calls.
+     *
+     * @return array
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array();
+    }
+
+    /**
+     * Builds the authorization header for getting an access or request token.
+     *
+     * @param array $extraParameters
+     *
+     * @return string
+     */
+    protected function buildAuthorizationHeaderForTokenRequest(array $extraParameters = array())
+    {
+        $parameters = $this->getBasicAuthorizationHeaderInfo();
+        $parameters = array_merge($parameters, $extraParameters);
+        $parameters['oauth_signature'] = $this->signature->getSignature(
+            $this->getRequestTokenEndpoint(),
+            $parameters,
+            'POST'
+        );
+
+        $authorizationHeader = 'OAuth ';
+        $delimiter = '';
+        foreach ($parameters as $key => $value) {
+            $authorizationHeader .= $delimiter . rawurlencode($key) . '="' . rawurlencode($value) . '"';
+
+            $delimiter = ', ';
+        }
+
+        return $authorizationHeader;
+    }
+
+    /**
+     * Builds the authorization header for an authenticated API request
+     *
+     * @param string         $method
+     * @param UriInterface   $uri        The uri the request is headed
+     * @param TokenInterface $token
+     * @param array          $bodyParams Request body if applicable (key/value pairs)
+     *
+     * @return string
+     */
+    protected function buildAuthorizationHeaderForAPIRequest(
+        $method,
+        UriInterface $uri,
+        TokenInterface $token,
+        $bodyParams = null
+    ) {
+        $this->signature->setTokenSecret($token->getAccessTokenSecret());
+        $authParameters = $this->getBasicAuthorizationHeaderInfo();
+        if (isset($authParameters['oauth_callback'])) {
+            unset($authParameters['oauth_callback']);
+        }
+
+        $authParameters = array_merge($authParameters, array('oauth_token' => $token->getAccessToken()));
+
+        $authParameters = (is_array($bodyParams)) ? array_merge($authParameters, $bodyParams) : $authParameters;
+        $authParameters['oauth_signature'] = $this->signature->getSignature($uri, $authParameters, $method);
+
+        if (isset($bodyParams['oauth_session_handle'])) {
+            $authParameters['oauth_session_handle'] = $bodyParams['oauth_session_handle'];
+            unset($bodyParams['oauth_session_handle']);
+        }
+
+        $authorizationHeader = 'OAuth ';
+        $delimiter = '';
+
+        foreach ($authParameters as $key => $value) {
+            $authorizationHeader .= $delimiter . rawurlencode($key) . '="' . rawurlencode($value) . '"';
+            $delimiter = ', ';
+        }
+
+        return $authorizationHeader;
+    }
+
+    /**
+     * Builds the authorization header array.
+     *
+     * @return array
+     */
+    protected function getBasicAuthorizationHeaderInfo()
+    {
+        $dateTime = new \DateTime();
+        $headerParameters = array(
+            'oauth_callback'         => $this->credentials->getCallbackUrl(),
+            'oauth_consumer_key'     => $this->credentials->getConsumerId(),
+            'oauth_nonce'            => $this->generateNonce(),
+            'oauth_signature_method' => $this->getSignatureMethod(),
+            'oauth_timestamp'        => $dateTime->format('U'),
+            'oauth_version'          => $this->getVersion(),
+        );
+
+        return $headerParameters;
+    }
+
+    /**
+     * Pseudo random string generator used to build a unique string to sign each request
+     *
+     * @param int $length
+     *
+     * @return string
+     */
+    protected function generateNonce($length = 32)
+    {
+        $characters = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+
+        $nonce = '';
+        $maxRand = strlen($characters)-1;
+        for ($i = 0; $i < $length; $i++) {
+            $nonce.= $characters[rand(0, $maxRand)];
+        }
+
+        return $nonce;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSignatureMethod()
+    {
+        return 'HMAC-SHA1';
+    }
+
+    /**
+     * This returns the version used in the authorization header of the requests
+     *
+     * @return string
+     */
+    protected function getVersion()
+    {
+        return '1.0';
+    }
+
+    /**
+     * Parses the request token response and returns a TokenInterface.
+     * This is only needed to verify the `oauth_callback_confirmed` parameter. The actual
+     * parsing logic is contained in the access token parser.
+     *
+     * @abstract
+     *
+     * @param string $responseBody
+     *
+     * @return TokenInterface
+     *
+     * @throws TokenResponseException
+     */
+    abstract protected function parseRequestTokenResponse($responseBody);
+
+    /**
+     * Parses the access token response and returns a TokenInterface.
+     *
+     * @abstract
+     *
+     * @param string $responseBody
+     *
+     * @return TokenInterface
+     *
+     * @throws TokenResponseException
+     */
+    abstract protected function parseAccessTokenResponse($responseBody);
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/BitBucket.php b/htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
new file mode 100644
index 00000000000..f6d8edfe17d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/BitBucket.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class BitBucket extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://bitbucket.org/api/1.0/');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://bitbucket.org/!api/1.0/oauth/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://bitbucket.org/!api/1.0/oauth/authenticate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://bitbucket.org/!api/1.0/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Etsy.php b/htdocs/includes/OAuth/OAuth1/Service/Etsy.php
new file mode 100644
index 00000000000..30dc331cba7
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Etsy.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Etsy extends AbstractService
+{
+
+    protected $scopes = array();
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://openapi.etsy.com/v2/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        $uri = new Uri($this->baseApiUri . 'oauth/request_token');
+        $scopes = $this->getScopes();
+
+        if (count($scopes)) {
+            $uri->setQuery('scope=' . implode('%20', $scopes));
+        }
+
+        return $uri;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri($this->baseApiUri);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri . 'oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * Set the scopes for permissions
+     * @see https://www.etsy.com/developers/documentation/getting_started/oauth#section_permission_scopes
+     * @param array $scopes
+     *
+     * @return $this
+     */
+    public function setScopes(array $scopes)
+    {
+        if (!is_array($scopes)) {
+            $scopes = array();
+        }
+
+        $this->scopes = $scopes;
+        return $this;
+    }
+
+    /**
+     * Return the defined scopes
+     * @return array
+     */
+    public function getScopes()
+    {
+        return $this->scopes;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/FitBit.php b/htdocs/includes/OAuth/OAuth1/Service/FitBit.php
new file mode 100644
index 00000000000..78032d75a77
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/FitBit.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class FitBit extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.fitbit.com/1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://api.fitbit.com/oauth/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.fitbit.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.fitbit.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php b/htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
new file mode 100644
index 00000000000..ea7f9b34d62
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/FiveHundredPx.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * 500px service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developers.500px.com/
+ */
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+/**
+ * 500px service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developers.500px.com/
+ */
+class FiveHundredPx extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $signature,
+            $baseApiUri
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.500px.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://api.500px.com/v1/oauth/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.500px.com/v1/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.500px.com/v1/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed'])
+            || $data['oauth_callback_confirmed'] !== 'true'
+        ) {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Flickr.php b/htdocs/includes/OAuth/OAuth1/Service/Flickr.php
new file mode 100644
index 00000000000..7ceee7dccaa
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Flickr.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Flickr extends AbstractService
+{
+    protected $format;
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+        if ($baseApiUri === null) {
+            $this->baseApiUri = new Uri('https://api.flickr.com/services/rest/');
+        }
+    }
+
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://www.flickr.com/services/oauth/request_token');
+    }
+
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.flickr.com/services/oauth/authorize');
+    }
+
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.flickr.com/services/oauth/access_token');
+    }
+
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] != 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+        if ($data === null || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $uri = $this->determineRequestUriFromPath('/', $this->baseApiUri);
+        $uri->addToQuery('method', $path);
+
+        if (!empty($this->format)) {
+            $uri->addToQuery('format', $this->format);
+
+            if ($this->format === 'json') {
+                $uri->addToQuery('nojsoncallback', 1);
+            }
+        }
+
+        $token = $this->storage->retrieveAccessToken($this->service());
+        $extraHeaders = array_merge($this->getExtraApiHeaders(), $extraHeaders);
+        $authorizationHeader = array(
+            'Authorization' => $this->buildAuthorizationHeaderForAPIRequest($method, $uri, $token, $body)
+        );
+        $headers = array_merge($authorizationHeader, $extraHeaders);
+
+        return $this->httpClient->retrieveResponse($uri, $body, $headers, $method);
+    }
+
+    public function requestRest($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        return $this->request($path, $method, $body, $extraHeaders);
+    }
+
+    public function requestXmlrpc($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $this->format = 'xmlrpc';
+
+        return $this->request($path, $method, $body, $extraHeaders);
+    }
+
+    public function requestSoap($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $this->format = 'soap';
+
+        return $this->request($path, $method, $body, $extraHeaders);
+    }
+
+    public function requestJson($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $this->format = 'json';
+
+        return $this->request($path, $method, $body, $extraHeaders);
+    }
+
+    public function requestPhp($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $this->format = 'php_serial';
+
+        return $this->request($path, $method, $body, $extraHeaders);
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php b/htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
new file mode 100644
index 00000000000..0014ca817d5
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/QuickBooks.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth1\Signature\SignatureInterface;
+
+class QuickBooks extends AbstractService
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $signature,
+            $baseApiUri
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://quickbooks.api.intuit.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://oauth.intuit.com/oauth/v1/get_request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://appcenter.intuit.com/Connect/Begin');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://oauth.intuit.com/oauth/v1/get_access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed'])
+            || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            $message = 'Error in retrieving token: "' . $data['error'] . '"';
+            throw new TokenResponseException($message);
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function request(
+        $path,
+        $method = 'GET',
+        $body = null,
+        array $extraHeaders = array()
+    ) {
+        $extraHeaders['Accept'] = 'application/json';
+        return parent::request($path, $method, $body, $extraHeaders);
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Redmine.php b/htdocs/includes/OAuth/OAuth1/Service/Redmine.php
new file mode 100644
index 00000000000..55f89a27594
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Redmine.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Redmine extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            throw new \Exception('baseApiUri is a required argument.');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri->getAbsoluteUri() . '/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri($this->baseApiUri->getAbsoluteUri() . '/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri->getAbsoluteUri() . '/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php b/htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
new file mode 100644
index 00000000000..28bd250b79f
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/ScoopIt.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class ScoopIt extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://www.scoop.it/api/1/');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://www.scoop.it/oauth/request');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.scoop.it/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.scoop.it/oauth/access');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php b/htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
new file mode 100644
index 00000000000..3f91fbf2c4c
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/ServiceInterface.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Service\ServiceInterface as BaseServiceInterface;
+use OAuth\OAuth1\Signature\SignatureInterface;
+
+/**
+ * Defines the common methods across OAuth 1 services.
+ */
+interface ServiceInterface extends BaseServiceInterface
+{
+    /**
+     * Retrieves and stores/returns the OAuth1 request token obtained from the service.
+     *
+     * @return TokenInterface $token
+     *
+     * @throws TokenResponseException
+     */
+    public function requestRequestToken();
+
+    /**
+     * Retrieves and stores/returns the OAuth1 access token after a successful authorization.
+     *
+     * @param string $token       The request token from the callback.
+     * @param string $verifier
+     * @param string $tokenSecret
+     *
+     * @return TokenInterface $token
+     *
+     * @throws TokenResponseException
+     */
+    public function requestAccessToken($token, $verifier, $tokenSecret);
+
+    /**
+     * @return UriInterface
+     */
+    public function getRequestTokenEndpoint();
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Tumblr.php b/htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
new file mode 100644
index 00000000000..3f5d38a8a4a
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Tumblr.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Tumblr extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.tumblr.com/v2/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://www.tumblr.com/oauth/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.tumblr.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.tumblr.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Twitter.php b/htdocs/includes/OAuth/OAuth1/Service/Twitter.php
new file mode 100644
index 00000000000..dea680fe44d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Twitter.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Exception\Exception;
+
+class Twitter extends AbstractService
+{
+    const ENDPOINT_AUTHENTICATE = "https://api.twitter.com/oauth/authenticate";
+    const ENDPOINT_AUTHORIZE    = "https://api.twitter.com/oauth/authorize";
+
+    protected $authorizationEndpoint   = self::ENDPOINT_AUTHENTICATE;
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.twitter.com/1.1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://api.twitter.com/oauth/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        if ($this->authorizationEndpoint != self::ENDPOINT_AUTHENTICATE
+        && $this->authorizationEndpoint != self::ENDPOINT_AUTHORIZE) {
+            $this->authorizationEndpoint = self::ENDPOINT_AUTHENTICATE;
+        }
+        return new Uri($this->authorizationEndpoint);
+    }
+
+    /**
+     * @param string $authorizationEndpoint
+     *
+     * @throws Exception
+     */
+    public function setAuthorizationEndpoint($endpoint)
+    {
+        if ($endpoint != self::ENDPOINT_AUTHENTICATE && $endpoint != self::ENDPOINT_AUTHORIZE) {
+            throw new Exception(
+                sprintf("'%s' is not a correct Twitter authorization endpoint.", $endpoint)
+            );
+        }
+        $this->authorizationEndpoint = $endpoint;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.twitter.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response: ' . $responseBody);
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        } elseif (!isset($data["oauth_token"]) || !isset($data["oauth_token_secret"])) {
+            throw new TokenResponseException('Invalid response. OAuth Token data not set: ' . $responseBody);
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Xing.php b/htdocs/includes/OAuth/OAuth1/Service/Xing.php
new file mode 100644
index 00000000000..e6824db3f0b
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Xing.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Xing extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.xing.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.xing.com/v1/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.xing.com/v1/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://api.xing.com/v1/request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+        $errors = json_decode($responseBody);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif ($errors) {
+            throw new TokenResponseException('Error in retrieving token: "' . $errors->error_name . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Service/Yahoo.php b/htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
new file mode 100644
index 00000000000..50a825b2546
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Service/Yahoo.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace OAuth\OAuth1\Service;
+
+use OAuth\OAuth1\Signature\SignatureInterface;
+use OAuth\OAuth1\Token\StdOAuth1Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\OAuth1\Token\TokenInterface;
+
+class Yahoo extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        SignatureInterface $signature,
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $signature, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://social.yahooapis.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://api.login.yahoo.com/oauth/v2/get_request_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.login.yahoo.com/oauth/v2/request_auth');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.login.yahoo.com/oauth/v2/get_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function refreshAccessToken(TokenInterface $token)
+    {
+        $extraParams = $token->getExtraParams();
+        $bodyParams = array('oauth_session_handle' => $extraParams['oauth_session_handle']);
+
+        $authorizationHeader = array(
+            'Authorization' => $this->buildAuthorizationHeaderForAPIRequest(
+                'POST',
+                $this->getAccessTokenEndpoint(),
+                $this->storage->retrieveAccessToken($this->service()),
+                $bodyParams
+            )
+        );
+
+
+        
+        $headers = array_merge($authorizationHeader, $this->getExtraOAuthHeaders(), array());
+
+        $responseBody = $this->httpClient->retrieveResponse($this->getAccessTokenEndpoint(), $bodyParams, $headers);
+
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth1Token();
+
+        $token->setRequestToken($data['oauth_token']);
+        $token->setRequestTokenSecret($data['oauth_token_secret']);
+        $token->setAccessToken($data['oauth_token']);
+        $token->setAccessTokenSecret($data['oauth_token_secret']);
+
+        if (isset($data['oauth_expires_in'])) {
+            $token->setLifetime($data['oauth_expires_in']);
+        } else {
+            $token->setEndOfLife(StdOAuth1Token::EOL_NEVER_EXPIRES);
+        }
+
+        unset($data['oauth_token'], $data['oauth_token_secret']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php b/htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
new file mode 100644
index 00000000000..44c36ce77cc
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Signature/Exception/UnsupportedHashAlgorithmException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OAuth\OAuth1\Signature\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Thrown when an unsupported hash mechanism is requested in signature class.
+ */
+class UnsupportedHashAlgorithmException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/Signature.php b/htdocs/includes/OAuth/OAuth1/Signature/Signature.php
new file mode 100644
index 00000000000..2e13eb373c4
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Signature/Signature.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace OAuth\OAuth1\Signature;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth1\Signature\Exception\UnsupportedHashAlgorithmException;
+
+class Signature implements SignatureInterface
+{
+    /**
+     * @var Credentials
+     */
+    protected $credentials;
+
+    /**
+     * @var string
+     */
+    protected $algorithm;
+
+    /**
+     * @var string
+     */
+    protected $tokenSecret = null;
+
+    /**
+     * @param CredentialsInterface $credentials
+     */
+    public function __construct(CredentialsInterface $credentials)
+    {
+        $this->credentials = $credentials;
+    }
+
+    /**
+     * @param string $algorithm
+     */
+    public function setHashingAlgorithm($algorithm)
+    {
+        $this->algorithm = $algorithm;
+    }
+
+    /**
+     * @param string $token
+     */
+    public function setTokenSecret($token)
+    {
+        $this->tokenSecret = $token;
+    }
+
+    /**
+     * @param UriInterface $uri
+     * @param array        $params
+     * @param string       $method
+     *
+     * @return string
+     */
+    public function getSignature(UriInterface $uri, array $params, $method = 'POST')
+    {
+        parse_str($uri->getQuery(), $queryStringData);
+
+        foreach (array_merge($queryStringData, $params) as $key => $value) {
+            $signatureData[rawurlencode($key)] = rawurlencode($value);
+        }
+
+        ksort($signatureData);
+
+        // determine base uri
+        $baseUri = $uri->getScheme() . '://' . $uri->getRawAuthority();
+
+        if ('/' === $uri->getPath()) {
+            $baseUri .= $uri->hasExplicitTrailingHostSlash() ? '/' : '';
+        } else {
+            $baseUri .= $uri->getPath();
+        }
+
+        $baseString = strtoupper($method) . '&';
+        $baseString .= rawurlencode($baseUri) . '&';
+        $baseString .= rawurlencode($this->buildSignatureDataString($signatureData));
+
+        return base64_encode($this->hash($baseString));
+    }
+
+    /**
+     * @param array $signatureData
+     *
+     * @return string
+     */
+    protected function buildSignatureDataString(array $signatureData)
+    {
+        $signatureString = '';
+        $delimiter = '';
+        foreach ($signatureData as $key => $value) {
+            $signatureString .= $delimiter . $key . '=' . $value;
+
+            $delimiter = '&';
+        }
+
+        return $signatureString;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSigningKey()
+    {
+        $signingKey = rawurlencode($this->credentials->getConsumerSecret()) . '&';
+        if ($this->tokenSecret !== null) {
+            $signingKey .= rawurlencode($this->tokenSecret);
+        }
+
+        return $signingKey;
+    }
+
+    /**
+     * @param string $data
+     *
+     * @return string
+     *
+     * @throws UnsupportedHashAlgorithmException
+     */
+    protected function hash($data)
+    {
+        switch (strtoupper($this->algorithm)) {
+            case 'HMAC-SHA1':
+                return hash_hmac('sha1', $data, $this->getSigningKey(), true);
+            default:
+                throw new UnsupportedHashAlgorithmException(
+                    'Unsupported hashing algorithm (' . $this->algorithm . ') used.'
+                );
+        }
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php b/htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
new file mode 100644
index 00000000000..da50ddb6da6
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Signature/SignatureInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace OAuth\OAuth1\Signature;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+interface SignatureInterface
+{
+    /**
+     * @param string $algorithm
+     */
+    public function setHashingAlgorithm($algorithm);
+
+    /**
+     * @param string $token
+     */
+    public function setTokenSecret($token);
+
+    /**
+     * @param UriInterface $uri
+     * @param array        $params
+     * @param string       $method
+     *
+     * @return string
+     */
+    public function getSignature(UriInterface $uri, array $params, $method = 'POST');
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php b/htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
new file mode 100644
index 00000000000..a12a79712e1
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Token/StdOAuth1Token.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace OAuth\OAuth1\Token;
+
+use OAuth\Common\Token\AbstractToken;
+
+/**
+ * Standard OAuth1 token implementation.
+ * Implements OAuth\OAuth1\Token\TokenInterface in case of any OAuth1 specific features.
+ */
+class StdOAuth1Token extends AbstractToken implements TokenInterface
+{
+    /**
+     * @var string
+     */
+    protected $requestToken;
+
+    /**
+     * @var string
+     */
+    protected $requestTokenSecret;
+
+    /**
+     * @var string
+     */
+    protected $accessTokenSecret;
+
+    /**
+     * @param string $requestToken
+     */
+    public function setRequestToken($requestToken)
+    {
+        $this->requestToken = $requestToken;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRequestToken()
+    {
+        return $this->requestToken;
+    }
+
+    /**
+     * @param string $requestTokenSecret
+     */
+    public function setRequestTokenSecret($requestTokenSecret)
+    {
+        $this->requestTokenSecret = $requestTokenSecret;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRequestTokenSecret()
+    {
+        return $this->requestTokenSecret;
+    }
+
+    /**
+     * @param string $accessTokenSecret
+     */
+    public function setAccessTokenSecret($accessTokenSecret)
+    {
+        $this->accessTokenSecret = $accessTokenSecret;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessTokenSecret()
+    {
+        return $this->accessTokenSecret;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php b/htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
new file mode 100644
index 00000000000..0bc3f7396f4
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth1/Token/TokenInterface.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace OAuth\OAuth1\Token;
+
+use OAuth\Common\Token\TokenInterface as BaseTokenInterface;
+
+/**
+ * OAuth1 specific token interface
+ */
+interface TokenInterface extends BaseTokenInterface
+{
+    /**
+     * @return string
+     */
+    public function getAccessTokenSecret();
+
+    /**
+     * @param string $accessTokenSecret
+     */
+    public function setAccessTokenSecret($accessTokenSecret);
+
+    /**
+     * @return string
+     */
+    public function getRequestTokenSecret();
+
+    /**
+     * @param string $requestTokenSecret
+     */
+    public function setRequestTokenSecret($requestTokenSecret);
+
+    /**
+     * @return string
+     */
+    public function getRequestToken();
+
+    /**
+     * @param string $requestToken
+     */
+    public function setRequestToken($requestToken);
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/AbstractService.php b/htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
new file mode 100644
index 00000000000..996506afbec
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/AbstractService.php
@@ -0,0 +1,364 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Exception\Exception;
+use OAuth\Common\Service\AbstractService as BaseAbstractService;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth2\Service\Exception\InvalidAuthorizationStateException;
+use OAuth\OAuth2\Service\Exception\InvalidScopeException;
+use OAuth\OAuth2\Service\Exception\MissingRefreshTokenException;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Token\Exception\ExpiredTokenException;
+
+abstract class AbstractService extends BaseAbstractService implements ServiceInterface
+{
+    /** @const OAUTH_VERSION */
+    const OAUTH_VERSION = 2;
+
+    /** @var array */
+    protected $scopes;
+
+    /** @var UriInterface|null */
+    protected $baseApiUri;
+
+    /** @var bool */
+    protected $stateParameterInAuthUrl;
+
+    /** @var string */
+    protected $apiVersion;
+
+    /**
+     * @param CredentialsInterface  $credentials
+     * @param ClientInterface       $httpClient
+     * @param TokenStorageInterface $storage
+     * @param array                 $scopes
+     * @param UriInterface|null     $baseApiUri
+     * @param bool $stateParameterInAutUrl
+     * @param string                $apiVersion
+     *
+     * @throws InvalidScopeException
+     */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null,
+        $stateParameterInAutUrl = false,
+        $apiVersion = ""
+    ) {
+        parent::__construct($credentials, $httpClient, $storage);
+        $this->stateParameterInAuthUrl = $stateParameterInAutUrl;
+
+        foreach ($scopes as $scope) {
+            if (!$this->isValidScope($scope)) {
+                throw new InvalidScopeException('Scope ' . $scope . ' is not valid for service ' . get_class($this));
+            }
+        }
+
+        $this->scopes = $scopes;
+
+        $this->baseApiUri = $baseApiUri;
+
+        $this->apiVersion = $apiVersion;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'type'          => 'web_server',
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        $parameters['scope'] = implode($this->getScopesDelimiter(), $this->scopes);
+
+        if ($this->needsStateParameterInAuthUrl()) {
+            if (!isset($parameters['state'])) {
+                $parameters['state'] = $this->generateAuthorizationState();
+            }
+            $this->storeAuthorizationState($parameters['state']);
+        }
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function requestAccessToken($code, $state = null)
+    {
+        if (null !== $state) {
+            $this->validateAuthorizationState($state);
+        }
+
+        $bodyParams = array(
+            'code'          => $code,
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'redirect_uri'  => $this->credentials->getCallbackUrl(),
+            'grant_type'    => 'authorization_code',
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $bodyParams,
+            $this->getExtraOAuthHeaders()
+        );
+
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * Sends an authenticated API request to the path provided.
+     * If the path provided is not an absolute URI, the base API Uri (must be passed into constructor) will be used.
+     *
+     * @param string|UriInterface $path
+     * @param string              $method       HTTP method
+     * @param array               $body         Request body if applicable.
+     * @param array               $extraHeaders Extra headers if applicable. These will override service-specific
+     *                                          any defaults.
+     *
+     * @return string
+     *
+     * @throws ExpiredTokenException
+     * @throws Exception
+     */
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $uri = $this->determineRequestUriFromPath($path, $this->baseApiUri);
+        $token = $this->storage->retrieveAccessToken($this->service());
+
+        if ($token->getEndOfLife() !== TokenInterface::EOL_NEVER_EXPIRES
+            && $token->getEndOfLife() !== TokenInterface::EOL_UNKNOWN
+            && time() > $token->getEndOfLife()
+        ) {
+            throw new ExpiredTokenException(
+                sprintf(
+                    'Token expired on %s at %s',
+                    date('m/d/Y', $token->getEndOfLife()),
+                    date('h:i:s A', $token->getEndOfLife())
+                )
+            );
+        }
+
+        // add the token where it may be needed
+        if (static::AUTHORIZATION_METHOD_HEADER_OAUTH === $this->getAuthorizationMethod()) {
+            $extraHeaders = array_merge(array('Authorization' => 'OAuth ' . $token->getAccessToken()), $extraHeaders);
+        } elseif (static::AUTHORIZATION_METHOD_QUERY_STRING === $this->getAuthorizationMethod()) {
+            $uri->addToQuery('access_token', $token->getAccessToken());
+        } elseif (static::AUTHORIZATION_METHOD_QUERY_STRING_V2 === $this->getAuthorizationMethod()) {
+            $uri->addToQuery('oauth2_access_token', $token->getAccessToken());
+        } elseif (static::AUTHORIZATION_METHOD_QUERY_STRING_V3 === $this->getAuthorizationMethod()) {
+            $uri->addToQuery('apikey', $token->getAccessToken());
+        } elseif (static::AUTHORIZATION_METHOD_QUERY_STRING_V4 === $this->getAuthorizationMethod()) {
+            $uri->addToQuery('auth', $token->getAccessToken());
+        } elseif (static::AUTHORIZATION_METHOD_HEADER_BEARER === $this->getAuthorizationMethod()) {
+            $extraHeaders = array_merge(array('Authorization' => 'Bearer ' . $token->getAccessToken()), $extraHeaders);
+        }
+
+        $extraHeaders = array_merge($this->getExtraApiHeaders(), $extraHeaders);
+
+        return $this->httpClient->retrieveResponse($uri, $body, $extraHeaders, $method);
+    }
+
+    /**
+     * Accessor to the storage adapter to be able to retrieve tokens
+     *
+     * @return TokenStorageInterface
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * Refreshes an OAuth2 access token.
+     *
+     * @param TokenInterface $token
+     *
+     * @return TokenInterface $token
+     *
+     * @throws MissingRefreshTokenException
+     */
+    public function refreshAccessToken(TokenInterface $token)
+    {
+        $refreshToken = $token->getRefreshToken();
+
+        if (empty($refreshToken)) {
+            throw new MissingRefreshTokenException();
+        }
+
+        $parameters = array(
+            'grant_type'    => 'refresh_token',
+            'type'          => 'web_server',
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'refresh_token' => $refreshToken,
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $parameters,
+            $this->getExtraOAuthHeaders()
+        );
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * Return whether or not the passed scope value is valid.
+     *
+     * @param string $scope
+     *
+     * @return bool
+     */
+    public function isValidScope($scope)
+    {
+        $reflectionClass = new \ReflectionClass(get_class($this));
+
+        return in_array($scope, $reflectionClass->getConstants(), true);
+    }
+
+    /**
+     * Check if the given service need to generate a unique state token to build the authorization url
+     *
+     * @return bool
+     */
+    public function needsStateParameterInAuthUrl()
+    {
+        return $this->stateParameterInAuthUrl;
+    }
+
+    /**
+     * Validates the authorization state against a given one
+     *
+     * @param string $state
+     * @throws InvalidAuthorizationStateException
+     */
+    protected function validateAuthorizationState($state)
+    {
+        if ($this->retrieveAuthorizationState() !== $state) {
+            throw new InvalidAuthorizationStateException();
+        }
+    }
+
+    /**
+     * Generates a random string to be used as state
+     *
+     * @return string
+     */
+    protected function generateAuthorizationState()
+    {
+        return md5(rand());
+    }
+
+    /**
+     * Retrieves the authorization state for the current service
+     *
+     * @return string
+     */
+    protected function retrieveAuthorizationState()
+    {
+        return $this->storage->retrieveAuthorizationState($this->service());
+    }
+
+    /**
+     * Stores a given authorization state into the storage
+     *
+     * @param string $state
+     */
+    protected function storeAuthorizationState($state)
+    {
+        $this->storage->storeAuthorizationState($this->service(), $state);
+    }
+
+    /**
+     * Return any additional headers always needed for this service implementation's OAuth calls.
+     *
+     * @return array
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array();
+    }
+
+    /**
+     * Return any additional headers always needed for this service implementation's API calls.
+     *
+     * @return array
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array();
+    }
+
+    /**
+     * Parses the access token response and returns a TokenInterface.
+     *
+     * @abstract
+     *
+     * @param string $responseBody
+     *
+     * @return TokenInterface
+     *
+     * @throws TokenResponseException
+     */
+    abstract protected function parseAccessTokenResponse($responseBody);
+
+    /**
+     * Returns a class constant from ServiceInterface defining the authorization method used for the API
+     * Header is the sane default.
+     *
+     * @return int
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_OAUTH;
+    }
+
+    /**
+     * Returns api version string if is set else retrun empty string
+     *
+     * @return string
+     */
+    protected function getApiVersionString()
+    {
+        return !(empty($this->apiVersion)) ? "/".$this->apiVersion : "" ;
+    }
+
+    /**
+     * Returns delimiter to scopes in getAuthorizationUri
+     * For services that do not fully respect the Oauth's RFC,
+     * and use scopes with commas as delimiter
+     *
+     * @return string
+     */
+    protected function getScopesDelimiter()
+    {
+        return ' ';
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Amazon.php b/htdocs/includes/OAuth/OAuth2/Service/Amazon.php
new file mode 100644
index 00000000000..035d1a557f8
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Amazon.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Amazon service.
+ *
+ * @author Flávio Heleno <flaviohbatista@gmail.com>
+ * @link https://images-na.ssl-images-amazon.com/images/G/01/lwa/dev/docs/website-developer-guide._TTH_.pdf
+ */
+class Amazon extends AbstractService
+{
+    /**
+     * Defined scopes
+     * @link https://images-na.ssl-images-amazon.com/images/G/01/lwa/dev/docs/website-developer-guide._TTH_.pdf
+     */
+    const SCOPE_PROFILE     = 'profile';
+    const SCOPE_POSTAL_CODE = 'postal_code';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.amazon.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.amazon.com/ap/oa');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.amazon.com/ap/oatoken');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error_description'] . '"');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Bitly.php b/htdocs/includes/OAuth/OAuth2/Service/Bitly.php
new file mode 100644
index 00000000000..e01cbc4296e
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Bitly.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Bitly extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api-ssl.bitly.com/v3/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://bitly.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api-ssl.bitly.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        // I'm invincible!!!
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function requestAccessToken($code, $state = null)
+    {
+        if (null !== $state) {
+            $this->validateAuthorizationState($state);
+        }
+
+        $bodyParams = array(
+            'code'          => $code,
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'redirect_uri'  => $this->credentials->getCallbackUrl(),
+            'grant_type'    => 'authorization_code',
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $bodyParams,
+            $this->getExtraOAuthHeaders()
+        );
+
+        // we can scream what we want that we want bitly to return a json encoded string (format=json), but the
+        // WOAH WATCH YOUR LANGUAGE ;) service doesn't seem to like screaming, hence we need to manually
+        // parse the result
+        $parsedResult = array();
+        parse_str($responseBody, $parsedResult);
+
+        $token = $this->parseAccessTokenResponse(json_encode($parsedResult));
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php b/htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
new file mode 100644
index 00000000000..1630d30dce5
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Bitrix24.php
@@ -0,0 +1,118 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Bitrix24 extends AbstractService
+{
+    const SCOPE_DEPARTMENT = 'department';
+    const SCOPE_CRM = 'crm';
+    const SCOPE_CALENDAR = 'calendar';
+    const SCOPE_USER = 'user';
+    const SCOPE_ENTITY = 'entity';
+    const SCOPE_TASK = 'task';
+    const SCOPE_TASKS_EXTENDED = 'tasks_extended';
+    const SCOPE_IM = 'im';
+    const SCOPE_LOG = 'log';
+    const SCOPE_SONET_GROUP = 'sonet_group';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri(sprintf('%s/oauth/authorize/', $this->baseApiUri));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri(sprintf('%s/oauth/token/', $this->baseApiUri));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function requestAccessToken($code, $state = null)
+    {
+        if (null !== $state) {
+            $this->validateAuthorizationState($state);
+        }
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenUri($code),
+            array(),
+            $this->getExtraOAuthHeaders(),
+            'GET'
+        );
+
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenUri($code)
+    {
+        $parameters = array(
+            'code'          => $code,
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'redirect_uri'  => $this->credentials->getCallbackUrl(),
+            'grant_type'    => 'authorization_code',
+            'scope'         => $this->scopes
+        );
+
+        $parameters['scope'] = implode(' ', $this->scopes);
+
+        // Build the url
+        $url = $this->getAccessTokenEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Box.php b/htdocs/includes/OAuth/OAuth2/Service/Box.php
new file mode 100644
index 00000000000..14696c5936d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Box.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Box service.
+ *
+ * @author Antoine Corcy <contact@sbin.dk>
+ * @link https://developers.box.com/oauth/
+ */
+class Box extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.box.com/2.0/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.box.com/api/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.box.com/api/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Buffer.php b/htdocs/includes/OAuth/OAuth2/Service/Buffer.php
new file mode 100644
index 00000000000..5905678e8c6
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Buffer.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+/**
+ * Buffer API.
+ * @author  Sumukh Sridhara <@sumukhsridhara>
+ * @link https://bufferapp.com/developers/api
+ */
+class Buffer extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+        if ($baseApiUri === null) {
+            $this->baseApiUri = new Uri('https://api.bufferapp.com/1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://bufferapp.com/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.bufferapp.com/1/oauth2/token.json');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function requestRequestToken()
+    {
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getRequestTokenEndpoint(),
+            array(
+                'client_key' => $this->credentials->getConsumerId(),
+                'redirect_uri' => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        $code = $this->parseRequestTokenResponse($responseBody);
+
+        return $code;
+    }
+
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['code'])) {
+            throw new TokenResponseException('Error in retrieving code.');
+        }
+        return $data['code'];
+    }
+
+    public function requestAccessToken($code)
+    {
+        $bodyParams = array(
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'redirect_uri' => $this->credentials->getCallbackUrl(),
+            'code'          => $code,
+            'grant_type'    => 'authorization_code',
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $bodyParams,
+            $this->getExtraOAuthHeaders()
+        );
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if ($data === null || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php b/htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
new file mode 100644
index 00000000000..095a467fd98
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Dailymotion.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Dailymotion service.
+ *
+ * @author Mouhamed SEYE <mouhamed@seye.pro>
+ * @link http://www.dailymotion.com/doc/api/authentication.html
+ */
+class Dailymotion extends AbstractService
+{
+    /**
+     * Scopes
+     *
+     * @var string
+     */
+    const SCOPE_EMAIL         = 'email',
+          SCOPE_PROFILE       = 'userinfo',
+          SCOPE_VIDEOS        = 'manage_videos',
+          SCOPE_COMMENTS      = 'manage_comments',
+          SCOPE_PLAYLIST      = 'manage_playlists',
+          SCOPE_TILES         = 'manage_tiles',
+          SCOPE_SUBSCRIPTIONS = 'manage_subscriptions',
+          SCOPE_FRIENDS       = 'manage_friends',
+          SCOPE_FAVORITES     = 'manage_favorites',
+          SCOPE_GROUPS        = 'manage_groups';
+
+    /**
+     * Dialog form factors
+     *
+     * @var string
+     */
+    const DISPLAY_PAGE   = 'page',
+          DISPLAY_POPUP  = 'popup',
+          DISPLAY_MOBILE = 'mobile';
+
+    /**
+    * {@inheritdoc}
+    */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.dailymotion.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.dailymotion.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.dailymotion.com/oauth/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_OAUTH;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description']) || isset($data['error'])) {
+            throw new TokenResponseException(
+                sprintf(
+                    'Error in retrieving token: "%s"',
+                    isset($data['error_description']) ? $data['error_description'] : $data['error']
+                )
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => 'application/json');
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Delicious.php b/htdocs/includes/OAuth/OAuth2/Service/Delicious.php
new file mode 100644
index 00000000000..eba6035f39d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Delicious.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Delicious service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link    https://github.com/SciDevs/delicious-api/blob/master/api/oauth.md
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Delicious service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link    https://github.com/SciDevs/delicious-api/blob/master/api/oauth.md
+ */
+class Delicious extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.del.icio.us/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://delicious.com/auth/authorize');
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://avosapi.delicious.com/api/v1/oauth/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifetime($data['expires_in']);
+            unset($data['expires_in']);
+        }
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+
+    // Special, delicious didn't respect the oauth2 RFC and need a grant_type='code'
+    /**
+     * {@inheritdoc}
+     */
+    public function requestAccessToken($code, $state = null)
+    {
+        if (null !== $state) {
+            $this->validateAuthorizationState($state);
+        }
+
+        $bodyParams = array(
+            'code'          => $code,
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'redirect_uri'  => $this->credentials->getCallbackUrl(),
+            'grant_type'    => 'code',
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $bodyParams,
+            $this->getExtraOAuthHeaders()
+        );
+
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php b/htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
new file mode 100644
index 00000000000..31e94b45dbd
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/DeviantArt.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Exception\Exception;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class DeviantArt extends AbstractService
+{
+    /**
+     * DeviantArt www url - used to build dialog urls
+     */
+    const WWW_URL = 'https://www.deviantart.com/';
+
+    /**
+     * Defined scopes
+     *
+     * If you don't think this is scary you should not be allowed on the web at all
+     *
+     * @link https://www.deviantart.com/developers/authentication
+     * @link https://www.deviantart.com/developers/http/v1/20150217
+     */
+    const SCOPE_FEED                       = 'feed';
+    const SCOPE_BROWSE                     = 'browse';
+    const SCOPE_COMMENT                    = 'comment.post';
+    const SCOPE_STASH                      = 'stash';
+    const SCOPE_USER                       = 'user';
+    const SCOPE_USERMANAGE                 = 'user.manage';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://www.deviantart.com/api/v1/oauth2/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.deviantart.com/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.deviantart.com/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifeTime($data['expires_in']);
+        }
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Dropbox.php b/htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
new file mode 100644
index 00000000000..43ec6c7f081
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Dropbox.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Dropbox service.
+ *
+ * @author Flávio Heleno <flaviohbatista@gmail.com>
+ * @link https://www.dropbox.com/developers/core/docs
+ */
+class Dropbox extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.dropbox.com/1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        $parameters['scope'] = implode(' ', $this->scopes);
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.dropbox.com/1/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.dropbox.com/1/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/EveOnline.php b/htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
new file mode 100644
index 00000000000..76fafa6d7ee
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/EveOnline.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Contains EveOnline class.
+ * PHP version 5.4
+ * @copyright 2014 Michael Cummings
+ * @author    Michael Cummings <mgcummings@yahoo.com>
+ */
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+
+/**
+ * Class EveOnline
+ */
+class EveOnline extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://login.eveonline.com');
+        }
+    }
+
+    /**
+     * Returns the authorization API endpoint.
+     * @return UriInterface
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri($this->baseApiUri . '/oauth/authorize');
+    }
+
+    /**
+     * Returns the access token API endpoint.
+     * @return UriInterface
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri . '/oauth/token');
+    }
+
+    /**
+     * Parses the access token response and returns a TokenInterface.
+     *
+     * @param string $responseBody
+     *
+     * @return TokenInterface
+     * @throws TokenResponseException
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error_description'] . '"');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
new file mode 100644
index 00000000000..398df2fdcfa
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAccessTypeException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace OAuth\OAuth2\Service\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Exception thrown when an invalid accessType for the Google Service is specified
+ */
+class InvalidAccessTypeException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
new file mode 100644
index 00000000000..fe9d550a67f
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidAuthorizationStateException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace OAuth\OAuth2\Service\Exception;
+
+/**
+ * Exception thrown when the state parameter received during the authorization process is invalid.
+ */
+class InvalidAuthorizationStateException extends \Exception
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
new file mode 100644
index 00000000000..c6a51c88696
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Exception/InvalidScopeException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @author David Desberg <david@daviddesberg.com>
+ * Released under the MIT license.
+ */
+
+namespace OAuth\OAuth2\Service\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Exception thrown when a scope provided to a service is invalid.
+ */
+class InvalidScopeException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php b/htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
new file mode 100644
index 00000000000..21eece6ac1b
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Exception/MissingRefreshTokenException.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @author David Desberg <david@daviddesberg.com>
+ * Released under the MIT license.
+ */
+
+namespace OAuth\OAuth2\Service\Exception;
+
+use OAuth\Common\Exception\Exception;
+
+/**
+ * Exception thrown when service is requested to refresh the access token but no refresh token can be found.
+ */
+class MissingRefreshTokenException extends Exception
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Facebook.php b/htdocs/includes/OAuth/OAuth2/Service/Facebook.php
new file mode 100644
index 00000000000..308513bce94
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Facebook.php
@@ -0,0 +1,208 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Exception\Exception;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Facebook extends AbstractService
+{
+    /**
+     * Facebook www url - used to build dialog urls
+     */
+    const WWW_URL = 'https://www.facebook.com/';
+
+    /**
+     * Defined scopes
+     *
+     * If you don't think this is scary you should not be allowed on the web at all
+     *
+     * @link https://developers.facebook.com/docs/reference/login/
+     * @link https://developers.facebook.com/tools/explorer For a list of permissions use 'Get Access Token'
+     */
+    // Default scope
+    const SCOPE_PUBLIC_PROFILE                = 'public_profile';
+    // Email scopes
+    const SCOPE_EMAIL                         = 'email';
+    // Extended permissions
+    const SCOPE_READ_FRIENDLIST               = 'read_friendlists';
+    const SCOPE_READ_INSIGHTS                 = 'read_insights';
+    const SCOPE_READ_MAILBOX                  = 'read_mailbox';
+    const SCOPE_READ_PAGE_MAILBOXES           = 'read_page_mailboxes';
+    const SCOPE_READ_REQUESTS                 = 'read_requests';
+    const SCOPE_READ_STREAM                   = 'read_stream';
+    const SCOPE_VIDEO_UPLOAD                  = 'video_upload';
+    const SCOPE_XMPP_LOGIN                    = 'xmpp_login';
+    const SCOPE_USER_ONLINE_PRESENCE          = 'user_online_presence';
+    const SCOPE_FRIENDS_ONLINE_PRESENCE       = 'friends_online_presence';
+    const SCOPE_ADS_MANAGEMENT                = 'ads_management';
+    const SCOPE_ADS_READ                      = 'ads_read';
+    const SCOPE_CREATE_EVENT                  = 'create_event';
+    const SCOPE_CREATE_NOTE                   = 'create_note';
+    const SCOPE_EXPORT_STREAM                 = 'export_stream';
+    const SCOPE_MANAGE_FRIENDLIST             = 'manage_friendlists';
+    const SCOPE_MANAGE_NOTIFICATIONS          = 'manage_notifications';
+    const SCOPE_PHOTO_UPLOAD                  = 'photo_upload';
+    const SCOPE_PUBLISH_ACTIONS               = 'publish_actions';
+    const SCOPE_PUBLISH_CHECKINS              = 'publish_checkins';
+    const SCOPE_PUBLISH_STREAM                = 'publish_stream';
+    const SCOPE_RSVP_EVENT                    = 'rsvp_event';
+    const SCOPE_SHARE_ITEM                    = 'share_item';
+    const SCOPE_SMS                           = 'sms';
+    const SCOPE_STATUS_UPDATE                 = 'status_update';
+    // Extended Profile Properties
+    const SCOPE_USER_POSTS                    = 'user_posts';
+    const SCOPE_USER_FRIENDS                  = 'user_friends';
+    const SCOPE_USER_ABOUT                    = 'user_about_me';
+    const SCOPE_USER_TAGGED_PLACES            = 'user_tagged_places';
+    const SCOPE_FRIENDS_ABOUT                 = 'friends_about_me';
+    const SCOPE_USER_ACTIVITIES               = 'user_activities';
+    const SCOPE_FRIENDS_ACTIVITIES            = 'friends_activities';
+    const SCOPE_USER_BIRTHDAY                 = 'user_birthday';
+    const SCOPE_FRIENDS_BIRTHDAY              = 'friends_birthday';
+    const SCOPE_USER_CHECKINS                 = 'user_checkins';
+    const SCOPE_FRIENDS_CHECKINS              = 'friends_checkins';
+    const SCOPE_USER_EDUCATION                = 'user_education_history';
+    const SCOPE_FRIENDS_EDUCATION             = 'friends_education_history';
+    const SCOPE_USER_EVENTS                   = 'user_events';
+    const SCOPE_FRIENDS_EVENTS                = 'friends_events';
+    const SCOPE_USER_GROUPS                   = 'user_groups';
+    const SCOPE_USER_MANAGED_GROUPS           = 'user_managed_groups';
+    const SCOPE_FRIENDS_GROUPS                = 'friends_groups';
+    const SCOPE_USER_HOMETOWN                 = 'user_hometown';
+    const SCOPE_FRIENDS_HOMETOWN              = 'friends_hometown';
+    const SCOPE_USER_INTERESTS                = 'user_interests';
+    const SCOPE_FRIEND_INTERESTS              = 'friends_interests';
+    const SCOPE_USER_LIKES                    = 'user_likes';
+    const SCOPE_FRIENDS_LIKES                 = 'friends_likes';
+    const SCOPE_USER_LOCATION                 = 'user_location';
+    const SCOPE_FRIENDS_LOCATION              = 'friends_location';
+    const SCOPE_USER_NOTES                    = 'user_notes';
+    const SCOPE_FRIENDS_NOTES                 = 'friends_notes';
+    const SCOPE_USER_PHOTOS                   = 'user_photos';
+    const SCOPE_USER_PHOTO_VIDEO_TAGS         = 'user_photo_video_tags';
+    const SCOPE_FRIENDS_PHOTOS                = 'friends_photos';
+    const SCOPE_FRIENDS_PHOTO_VIDEO_TAGS      = 'friends_photo_video_tags';
+    const SCOPE_USER_QUESTIONS                = 'user_questions';
+    const SCOPE_FRIENDS_QUESTIONS             = 'friends_questions';
+    const SCOPE_USER_RELATIONSHIPS            = 'user_relationships';
+    const SCOPE_FRIENDS_RELATIONSHIPS         = 'friends_relationships';
+    const SCOPE_USER_RELATIONSHIPS_DETAILS    = 'user_relationship_details';
+    const SCOPE_FRIENDS_RELATIONSHIPS_DETAILS = 'friends_relationship_details';
+    const SCOPE_USER_RELIGION                 = 'user_religion_politics';
+    const SCOPE_FRIENDS_RELIGION              = 'friends_religion_politics';
+    const SCOPE_USER_STATUS                   = 'user_status';
+    const SCOPE_FRIENDS_STATUS                = 'friends_status';
+    const SCOPE_USER_SUBSCRIPTIONS            = 'user_subscriptions';
+    const SCOPE_FRIENDS_SUBSCRIPTIONS         = 'friends_subscriptions';
+    const SCOPE_USER_VIDEOS                   = 'user_videos';
+    const SCOPE_FRIENDS_VIDEOS                = 'friends_videos';
+    const SCOPE_USER_WEBSITE                  = 'user_website';
+    const SCOPE_FRIENDS_WEBSITE               = 'friends_website';
+    const SCOPE_USER_WORK                     = 'user_work_history';
+    const SCOPE_FRIENDS_WORK                  = 'friends_work_history';
+    // Open Graph Permissions
+    const SCOPE_USER_MUSIC                    = 'user_actions.music';
+    const SCOPE_FRIENDS_MUSIC                 = 'friends_actions.music';
+    const SCOPE_USER_NEWS                     = 'user_actions.news';
+    const SCOPE_FRIENDS_NEWS                  = 'friends_actions.news';
+    const SCOPE_USER_VIDEO                    = 'user_actions.video';
+    const SCOPE_FRIENDS_VIDEO                 = 'friends_actions.video';
+    const SCOPE_USER_APP                      = 'user_actions:APP_NAMESPACE';
+    const SCOPE_FRIENDS_APP                   = 'friends_actions:APP_NAMESPACE';
+    const SCOPE_USER_GAMES                    = 'user_games_activity';
+    const SCOPE_FRIENDS_GAMES                 = 'friends_games_activity';
+    //Page Permissions
+    const SCOPE_PAGES                         = 'manage_pages';
+    const SCOPE_PUBLISH_PAGES                 = 'publish_pages';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null,
+        $apiVersion = ""
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true, $apiVersion);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://graph.facebook.com'.$this->getApiVersionString().'/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.facebook.com'.$this->getApiVersionString().'/dialog/oauth');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://graph.facebook.com'.$this->getApiVersionString().'/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        // Facebook gives us a query string ... Oh wait. JSON is too simple, understand ?
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        
+        if (isset($data['expires'])) {
+            $token->setLifeTime($data['expires']);
+        }
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    public function getDialogUri($dialogPath, array $parameters)
+    {
+        if (!isset($parameters['redirect_uri'])) {
+            throw new Exception("Redirect uri is mandatory for this request");
+        }
+        $parameters['app_id'] = $this->credentials->getConsumerId();
+        $baseUrl = self::WWW_URL .$this->getApiVersionString(). '/dialog/' . $dialogPath;
+        $query = http_build_query($parameters);
+        return new Uri($baseUrl . '?' . $query);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getScopesDelimiter()
+    {
+        return ',';
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Foursquare.php b/htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
new file mode 100644
index 00000000000..981ff44f691
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Foursquare.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Foursquare extends AbstractService
+{
+    private $apiVersionDate = '20130829';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.foursquare.com/v2/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://foursquare.com/oauth2/authenticate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://foursquare.com/oauth2/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        // Foursquare tokens evidently never expire...
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        $uri = $this->determineRequestUriFromPath($path, $this->baseApiUri);
+        $uri->addToQuery('v', $this->apiVersionDate);
+
+        return parent::request($uri, $method, $body, $extraHeaders);
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/GitHub.php b/htdocs/includes/OAuth/OAuth2/Service/GitHub.php
new file mode 100644
index 00000000000..8d4d122f1fc
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/GitHub.php
@@ -0,0 +1,216 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class GitHub extends AbstractService
+{
+    /**
+     * Defined scopes, see http://developer.github.com/v3/oauth/ for definitions.
+     */
+
+    /**
+     * Public read-only access (includes public user profile info, public repo info, and gists)
+     */
+    const SCOPE_READONLY = '';
+
+    /**
+     * Read/write access to profile info only.
+     *
+     * Includes SCOPE_USER_EMAIL and SCOPE_USER_FOLLOW.
+     */
+    const SCOPE_USER = 'user';
+
+    /**
+     * Read access to a user’s email addresses.
+     */
+    const SCOPE_USER_EMAIL = 'user:email';
+
+    /**
+     * Access to follow or unfollow other users.
+     */
+    const SCOPE_USER_FOLLOW = 'user:follow';
+
+    /**
+     * Read/write access to public repos and organizations.
+     */
+    const SCOPE_PUBLIC_REPO = 'public_repo';
+
+    /**
+     * Read/write access to public and private repos and organizations.
+     *
+     * Includes SCOPE_REPO_STATUS.
+     */
+    const SCOPE_REPO = 'repo';
+
+    /**
+     * Grants access to deployment statuses for public and private repositories.
+     * This scope is only necessary to grant other users or services access to deployment statuses,
+     * without granting access to the code.
+     */
+    const SCOPE_REPO_DEPLOYMENT = 'repo_deployment';
+
+    /**
+     * Read/write access to public and private repository commit statuses. This scope is only necessary to grant other
+     * users or services access to private repository commit statuses without granting access to the code. The repo and
+     * public_repo scopes already include access to commit status for private and public repositories, respectively.
+     */
+    const SCOPE_REPO_STATUS = 'repo:status';
+
+    /**
+     * Delete access to adminable repositories.
+     */
+    const SCOPE_DELETE_REPO = 'delete_repo';
+
+    /**
+     * Read access to a user’s notifications. repo is accepted too.
+     */
+    const SCOPE_NOTIFICATIONS = 'notifications';
+
+    /**
+     * Write access to gists.
+     */
+    const SCOPE_GIST = 'gist';
+
+    /**
+     * Grants read and ping access to hooks in public or private repositories.
+     */
+    const SCOPE_HOOKS_READ = 'read:repo_hook';
+
+    /**
+     * Grants read, write, and ping access to hooks in public or private repositories.
+     */
+    const SCOPE_HOOKS_WRITE = 'write:repo_hook';
+
+    /**
+     * Grants read, write, ping, and delete access to hooks in public or private repositories.
+     */
+    const SCOPE_HOOKS_ADMIN = 'admin:repo_hook';
+
+    /**
+     * Read-only access to organization, teams, and membership.
+     */
+    const SCOPE_ORG_READ = 'read:org';
+
+    /**
+     * Publicize and unpublicize organization membership.
+     */
+    const SCOPE_ORG_WRITE = 'write:org';
+
+    /**
+     * Fully manage organization, teams, and memberships.
+     */
+    const SCOPE_ORG_ADMIN = 'admin:org';
+
+    /**
+     * List and view details for public keys.
+     */
+    const SCOPE_PUBLIC_KEY_READ = 'read:public_key';
+
+    /**
+     * Create, list, and view details for public keys.
+     */
+    const SCOPE_PUBLIC_KEY_WRITE = 'write:public_key';
+
+    /**
+     * Fully manage public keys.
+     */
+    const SCOPE_PUBLIC_KEY_ADMIN = 'admin:public_key';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.github.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://github.com/login/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://github.com/login/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        // Github tokens evidently never expire...
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * Used to configure response type -- we want JSON from github, default is query string format
+     *
+     * @return array
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => 'application/json');
+    }
+
+    /**
+     * Required for GitHub API calls.
+     *
+     * @return array
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array('Accept' => 'application/vnd.github.beta+json');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getScopesDelimiter()
+    {
+        return ',';
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Google.php b/htdocs/includes/OAuth/OAuth2/Service/Google.php
new file mode 100644
index 00000000000..a8bb44d8238
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Google.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\OAuth2\Service\Exception\InvalidAccessTypeException;
+use OAuth\Common\Http\Uri\Uri;
+
+class Google extends AbstractService
+{
+    /**
+     * Defined scopes - More scopes are listed here:
+     * https://developers.google.com/oauthplayground/
+     *
+     * Make a pull request if you need more scopes.
+     */
+
+    // Basic
+    const SCOPE_EMAIL                       = 'email';
+    const SCOPE_PROFILE                     = 'profile';
+
+    const SCOPE_USERINFO_EMAIL              = 'https://www.googleapis.com/auth/userinfo.email';
+    const SCOPE_USERINFO_PROFILE            = 'https://www.googleapis.com/auth/userinfo.profile';
+
+    // Google+
+    const SCOPE_GPLUS_ME                    = 'https://www.googleapis.com/auth/plus.me';
+    const SCOPE_GPLUS_LOGIN                 = 'https://www.googleapis.com/auth/plus.login';
+    const SCOPE_GPLUS_CIRCLES_READ          = 'https://www.googleapis.com/auth/plus.circles.read';
+    const SCOPE_GPLUS_CIRCLES_WRITE         = 'https://www.googleapis.com/auth/plus.circles.write';
+    const SCOPE_GPLUS_STREAM_READ           = 'https://www.googleapis.com/auth/plus.stream.read';
+    const SCOPE_GPLUS_STREAM_WRITE          = 'https://www.googleapis.com/auth/plus.stream.write';
+    const SCOPE_GPLUS_MEDIA                 = 'https://www.googleapis.com/auth/plus.media.upload';
+
+    // Google Drive
+    const SCOPE_DOCUMENTSLIST               = 'https://docs.google.com/feeds/';
+    const SCOPE_SPREADSHEETS                = 'https://spreadsheets.google.com/feeds/';
+    const SCOPE_GOOGLEDRIVE                 = 'https://www.googleapis.com/auth/drive';
+    const SCOPE_DRIVE_APPS                  = 'https://www.googleapis.com/auth/drive.appdata';
+    const SCOPE_DRIVE_APPS_READ_ONLY        = 'https://www.googleapis.com/auth/drive.apps.readonly';
+    const SCOPE_GOOGLEDRIVE_FILES           = 'https://www.googleapis.com/auth/drive.file';
+    const SCOPE_DRIVE_METADATA_READ_ONLY    = 'https://www.googleapis.com/auth/drive.metadata.readonly';
+    const SCOPE_DRIVE_READ_ONLY             = 'https://www.googleapis.com/auth/drive.readonly';
+    const SCOPE_DRIVE_SCRIPTS               = 'https://www.googleapis.com/auth/drive.scripts';
+
+    // Cloud Print
+    const SCOPE_CLOUD_PRINT                 = 'https://www.googleapis.com/auth/cloudprint';
+
+    // Adwords
+    const SCOPE_ADSENSE                     = 'https://www.googleapis.com/auth/adsense';
+    const SCOPE_ADWORDS                     = 'https://www.googleapis.com/auth/adwords/';
+    const SCOPE_GAN                         = 'https://www.googleapis.com/auth/gan'; // google affiliate network...?
+
+    // Google Analytics
+    const SCOPE_ANALYTICS                   = 'https://www.googleapis.com/auth/analytics';
+    const SCOPE_ANALYTICS_EDIT              = 'https://www.googleapis.com/auth/analytics.edit';
+    const SCOPE_ANALYTICS_MANAGE_USERS      = 'https://www.googleapis.com/auth/analytics.manage.users';
+    const SCOPE_ANALYTICS_READ_ONLY         = 'https://www.googleapis.com/auth/analytics.readonly';
+
+    //Gmail
+    const SCOPE_GMAIL_MODIFY                = 'https://www.googleapis.com/auth/gmail.modify';
+    const SCOPE_GMAIL_READONLY              = 'https://www.googleapis.com/auth/gmail.readonly';
+    const SCOPE_GMAIL_COMPOSE               = 'https://www.googleapis.com/auth/gmail.compose';
+    const SCOPE_GMAIL_SEND                  = 'https://www.googleapis.com/auth/gmail.send';
+    const SCOPE_GMAIL_INSERT                = 'https://www.googleapis.com/auth/gmail.insert';
+    const SCOPE_GMAIL_LABELS                = 'https://www.googleapis.com/auth/gmail.labels';
+    const SCOPE_GMAIL_FULL                  = 'https://mail.google.com/';
+
+    // Other services
+    const SCOPE_BOOKS                       = 'https://www.googleapis.com/auth/books';
+    const SCOPE_BLOGGER                     = 'https://www.googleapis.com/auth/blogger';
+    const SCOPE_CALENDAR                    = 'https://www.googleapis.com/auth/calendar';
+    const SCOPE_CALENDAR_READ_ONLY          = 'https://www.googleapis.com/auth/calendar.readonly';
+    const SCOPE_CONTACT                     = 'https://www.google.com/m8/feeds/';
+    const SCOPE_CONTACTS_RO                 = 'https://www.googleapis.com/auth/contacts.readonly';
+    const SCOPE_CHROMEWEBSTORE              = 'https://www.googleapis.com/auth/chromewebstore.readonly';
+    const SCOPE_GMAIL                       = 'https://mail.google.com/mail/feed/atom';
+    const SCOPE_GMAIL_IMAP_SMTP             = 'https://mail.google.com';
+    const SCOPE_PICASAWEB                   = 'https://picasaweb.google.com/data/';
+    const SCOPE_SITES                       = 'https://sites.google.com/feeds/';
+    const SCOPE_URLSHORTENER                = 'https://www.googleapis.com/auth/urlshortener';
+    const SCOPE_WEBMASTERTOOLS              = 'https://www.google.com/webmasters/tools/feeds/';
+    const SCOPE_TASKS                       = 'https://www.googleapis.com/auth/tasks';
+
+    // Cloud services
+    const SCOPE_CLOUDSTORAGE                = 'https://www.googleapis.com/auth/devstorage.read_write';
+    const SCOPE_CONTENTFORSHOPPING          = 'https://www.googleapis.com/auth/structuredcontent'; // what even is this
+    const SCOPE_USER_PROVISIONING           = 'https://apps-apis.google.com/a/feeds/user/';
+    const SCOPE_GROUPS_PROVISIONING         = 'https://apps-apis.google.com/a/feeds/groups/';
+    const SCOPE_NICKNAME_PROVISIONING       = 'https://apps-apis.google.com/a/feeds/alias/';
+
+    // Old
+    const SCOPE_ORKUT                       = 'https://www.googleapis.com/auth/orkut';
+    const SCOPE_GOOGLELATITUDE =
+        'https://www.googleapis.com/auth/latitude.all.best https://www.googleapis.com/auth/latitude.all.city';
+    const SCOPE_OPENID                      = 'openid';
+
+    // YouTube
+    const SCOPE_YOUTUBE_GDATA               = 'https://gdata.youtube.com';
+    const SCOPE_YOUTUBE_ANALYTICS_MONETARY  = 'https://www.googleapis.com/auth/yt-analytics-monetary.readonly';
+    const SCOPE_YOUTUBE_ANALYTICS           = 'https://www.googleapis.com/auth/yt-analytics.readonly';
+    const SCOPE_YOUTUBE                     = 'https://www.googleapis.com/auth/youtube';
+    const SCOPE_YOUTUBE_READ_ONLY           = 'https://www.googleapis.com/auth/youtube.readonly';
+    const SCOPE_YOUTUBE_UPLOAD              = 'https://www.googleapis.com/auth/youtube.upload';
+    const SCOPE_YOUTUBE_PARTNER             = 'https://www.googleapis.com/auth/youtubepartner';
+    const SCOPE_YOUTUBE_PARTNER_AUDIT       = 'https://www.googleapis.com/auth/youtubepartner-channel-audit';
+
+    // Google Glass
+    const SCOPE_GLASS_TIMELINE              = 'https://www.googleapis.com/auth/glass.timeline';
+    const SCOPE_GLASS_LOCATION              = 'https://www.googleapis.com/auth/glass.location';
+
+    // Android Publisher
+    const SCOPE_ANDROID_PUBLISHER           = 'https://www.googleapis.com/auth/androidpublisher';
+
+    protected $accessType = 'online';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://www.googleapis.com/oauth2/v1/');
+        }
+    }
+
+    public function setAccessType($accessType)
+    {
+        if (!in_array($accessType, array('online', 'offline'), true)) {
+            throw new InvalidAccessTypeException('Invalid accessType, expected either online or offline');
+        }
+        $this->accessType = $accessType;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://accounts.google.com/o/oauth2/auth?access_type=' . $this->accessType);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://accounts.google.com/o/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Harvest.php b/htdocs/includes/OAuth/OAuth2/Service/Harvest.php
new file mode 100644
index 00000000000..96fb0f2da7d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Harvest.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+
+class Harvest extends AbstractService
+{
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.harvestapp.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'state' => 'optional-csrf-token',
+                'response_type' => 'code',
+            )
+        );
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.harvestapp.com/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.harvestapp.com/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || ! is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+        $token->setRefreshToken($data['refresh_token']);
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * Refreshes an OAuth2 access token.
+     *
+     * @param TokenInterface $token
+     *
+     * @return TokenInterface $token
+     *
+     * @throws MissingRefreshTokenException
+     */
+    public function refreshAccessToken(TokenInterface $token)
+    {
+        $refreshToken = $token->getRefreshToken();
+
+        if (empty($refreshToken)) {
+            throw new MissingRefreshTokenException();
+        }
+
+        $parameters = array(
+            'grant_type'    => 'refresh_token',
+            'type'          => 'web_server',
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'refresh_token' => $refreshToken,
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $parameters,
+            $this->getExtraOAuthHeaders()
+        );
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+
+    /**
+     * @return array
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => 'application/json');
+    }
+
+    /**
+     * Return any additional headers always needed for this service implementation's API calls.
+     *
+     * @return array
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array('Accept' => 'application/json');
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Heroku.php b/htdocs/includes/OAuth/OAuth2/Service/Heroku.php
new file mode 100644
index 00000000000..470cedc3398
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Heroku.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Heroku service.
+ *
+ * @author Thomas Welton <thomaswelton@me.com>
+ * @link https://devcenter.heroku.com/articles/oauth
+ */
+class Heroku extends AbstractService
+{
+    /**
+     * Defined scopes
+     * @link https://devcenter.heroku.com/articles/oauth#scopes
+     */
+    const SCOPE_GLOBAL          = 'global';
+    const SCOPE_IDENTITY        = 'identity';
+    const SCOPE_READ            = 'read';
+    const SCOPE_WRITE           = 'write';
+    const SCOPE_READ_PROTECTED  = 'read-protected';
+    const SCOPE_WRITE_PROTECTED = 'write-protected';
+
+    /**
+    * {@inheritdoc}
+    */
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.heroku.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://id.heroku.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://id.heroku.com/oauth/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description']) || isset($data['error'])) {
+            throw new TokenResponseException(
+                sprintf(
+                    'Error in retrieving token: "%s"',
+                    isset($data['error_description']) ? $data['error_description'] : $data['error']
+                )
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => 'application/vnd.heroku+json; version=3');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array('Accept' => 'application/vnd.heroku+json; version=3', 'Content-Type' => 'application/json');
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Hubic.php b/htdocs/includes/OAuth/OAuth2/Service/Hubic.php
new file mode 100644
index 00000000000..b9954503f59
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Hubic.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Hubic service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://api.hubic.com/docs/
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Hubic service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://api.hubic.com/docs/
+ */
+class Hubic extends AbstractService
+{
+
+    // Scopes
+    const SCOPE_USAGE_GET       = 'usage.r';
+    const SCOPE_ACCOUNT_GET     = 'account.r';
+    const SCOPE_GETALLLINKS_GET = 'getAllLinks.r';
+    const SCOPE_CREDENTIALS_GET = 'credentials.r';
+    const SCOPE_SPONSORCODE_GET = 'sponsorCode.r';
+    const SCOPE_ACTIVATE_POST   = 'activate.w';
+    const SCOPE_SPONSORED_GET   = 'sponsored.r';
+    const SCOPE_LINKS_GET       = 'links.r';
+    const SCOPE_LINKS_POST      = 'links.rw';
+    const SCOPE_LINKS_ALL       = 'links.drw';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.hubic.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.hubic.com/oauth/auth');
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.hubic.com/oauth/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'type'          => 'web_server',
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        // special, hubic use a param scope with commas
+        // between scopes instead of spaces
+        $parameters['scope'] = implode(',', $this->scopes);
+
+        if ($this->needsStateParameterInAuthUrl()) {
+            if (!isset($parameters['state'])) {
+                $parameters['state'] = $this->generateAuthorizationState();
+            }
+            $this->storeAuthorizationState($parameters['state']);
+        }
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Instagram.php b/htdocs/includes/OAuth/OAuth2/Service/Instagram.php
new file mode 100644
index 00000000000..c60c455f492
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Instagram.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Instagram extends AbstractService
+{
+    /**
+     * Defined scopes
+     * @link http://instagram.com/developer/authentication/#scope
+     */
+    const SCOPE_BASIC         = 'basic';
+    const SCOPE_COMMENTS      = 'comments';
+    const SCOPE_RELATIONSHIPS = 'relationships';
+    const SCOPE_LIKES         = 'likes';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.instagram.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.instagram.com/oauth/authorize/');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.instagram.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        // Instagram tokens evidently never expire...
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php b/htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
new file mode 100644
index 00000000000..fad112536ce
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/JawboneUP.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Jawbone UP service.
+ *
+ * @author Andrii Gakhov <andrii.gakhov@gmail.com>
+ * @link https://jawbone.com/up/developer/authentication
+ */
+class JawboneUP extends AbstractService
+{
+    /**
+     * Defined scopes
+     *
+     *
+     * @link https://jawbone.com/up/developer/authentication
+     */
+    // general information scopes
+    const SCOPE_BASIC_READ          = 'basic_read';
+    const SCOPE_EXTENDED_READ       = 'extended_read';
+    const SCOPE_LOCATION_READ       = 'location_read';
+    const SCOPE_FRIENDS_READ        = 'friends_read';
+    // mood scopes
+    const SCOPE_MOOD_READ           = 'mood_read';
+    const SCOPE_MOOD_WRITE          = 'mood_write';
+    // move scopes
+    const SCOPE_MOVE_READ           = 'move_read';
+    const SCOPE_MOVE_WRITE          = 'move_write';
+    // sleep scopes
+    const SCOPE_SLEEP_READ          = 'sleep_read';
+    const SCOPE_SLEEP_WRITE         = 'sleep_write';
+    // meal scopes
+    const SCOPE_MEAL_READ           = 'meal_read';
+    const SCOPE_MEAL_WRITE          = 'meal_write';
+    // weight scopes
+    const SCOPE_WEIGHT_READ         = 'weight_read';
+    const SCOPE_WEIGHT_WRITE        = 'weight_write';
+    // generic event scopes
+    const SCOPE_GENERIC_EVENT_READ  = 'generic_event_read';
+    const SCOPE_GENERIC_EVENT_WRITE = 'generic_event_write';
+
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://jawbone.com/nudge/api/v.1.1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        $parameters['scope'] = implode(' ', $this->scopes);
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://jawbone.com/auth/oauth2/auth');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://jawbone.com/auth/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Linkedin.php b/htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
new file mode 100644
index 00000000000..9c0674c5142
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Linkedin.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Linkedin service.
+ *
+ * @author Antoine Corcy <contact@sbin.dk>
+ * @link http://developer.linkedin.com/documents/authentication
+ */
+class Linkedin extends AbstractService
+{
+    /**
+     * Defined scopes
+     * @link http://developer.linkedin.com/documents/authentication#granting
+     */
+    const SCOPE_R_BASICPROFILE      = 'r_basicprofile';
+    const SCOPE_R_FULLPROFILE       = 'r_fullprofile';
+    const SCOPE_R_EMAILADDRESS      = 'r_emailaddress';
+    const SCOPE_R_NETWORK           = 'r_network';
+    const SCOPE_R_CONTACTINFO       = 'r_contactinfo';
+    const SCOPE_RW_NUS              = 'rw_nus';
+    const SCOPE_RW_COMPANY_ADMIN    = 'rw_company_admin';
+    const SCOPE_RW_GROUPS           = 'rw_groups';
+    const SCOPE_W_MESSAGES          = 'w_messages';
+    const SCOPE_W_SHARE             = 'w_share';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.linkedin.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.linkedin.com/uas/oauth2/authorization');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.linkedin.com/uas/oauth2/accessToken');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING_V2;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php b/htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
new file mode 100644
index 00000000000..842153de2e7
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Mailchimp.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Mailchimp extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (is_null($this->baseApiUri) && $storage->hasAccessToken($this->service())) {
+            $this->setBaseApiUri($storage->retrieveAccessToken($this->service()));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING_V3;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://login.mailchimp.com/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://login.mailchimp.com/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        // Parse JSON
+        $data = json_decode($responseBody, true);
+
+        // Do validation.
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        // Create token object.
+        $token = new StdOAuth2Token($data['access_token']);
+
+        // Set the right API endpoint.
+        $this->setBaseApiUri($token);
+
+        // Mailchimp tokens evidently never expire...
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function request($path, $method = 'GET', $body = null, array $extraHeaders = array())
+    {
+        if (is_null($this->baseApiUri)) {
+            $this->setBaseApiUri($this->storage->retrieveAccessToken($this->service()));
+        }
+
+        return parent::request($path, $method, $body, $extraHeaders);
+    }
+
+    /**
+     * Set the right base endpoint.
+     *
+     * @param StdOAuth2Token $token
+     */
+    protected function setBaseApiUri(StdOAuth2Token $token)
+    {
+        // Make request uri.
+        $endpoint = 'https://login.mailchimp.com/oauth2/metadata?oauth_token='. $token->getAccessToken();
+
+        // Grab meta data about the token.
+        $response = $this->httpClient->retrieveResponse(new Uri($endpoint), array(), array(), 'GET');
+
+        // Parse JSON.
+        $meta = json_decode($response, true);
+
+        // Set base api uri.
+        $this->baseApiUri = new Uri('https://'. $meta['dc'] .'.api.mailchimp.com/2.0/');
+
+        // Allow chaining.
+        return $this;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php b/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
new file mode 100644
index 00000000000..c815b22bd44
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Microsoft.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Microsoft extends AbstractService
+{
+    const SCOPE_BASIC = 'wl.basic';
+    const SCOPE_OFFLINE = 'wl.offline_access';
+    const SCOPE_SIGNIN = 'wl.signin';
+    const SCOPE_BIRTHDAY = 'wl.birthday';
+    const SCOPE_CALENDARS = 'wl.calendars';
+    const SCOPE_CALENDARS_UPDATE = 'wl.calendars_update';
+    const SCOPE_CONTACTS_BIRTHDAY = 'wl.contacts_birthday';
+    const SCOPE_CONTACTS_CREATE = 'wl.contacts_create';
+    const SCOPE_CONTACTS_CALENDARS = 'wl.contacts_calendars';
+    const SCOPE_CONTACTS_PHOTOS = 'wl.contacts_photos';
+    const SCOPE_CONTACTS_SKYDRIVE = 'wl.contacts_skydrive';
+    const SCOPE_EMAILS = 'wl.emails';
+    const SCOPE_EVENTS_CREATE = 'wl.events_create';
+    const SCOPE_MESSENGER = 'wl.messenger';
+    const SCOPE_PHONE_NUMBERS = 'wl.phone_numbers';
+    const SCOPE_PHOTOS = 'wl.photos';
+    const SCOPE_POSTAL_ADDRESSES = 'wl.postal_addresses';
+    const SCOPE_SHARE = 'wl.share';
+    const SCOPE_SKYDRIVE = 'wl.skydrive';
+    const SCOPE_SKYDRIVE_UPDATE = 'wl.skydrive_update';
+    const SCOPE_WORK_PROFILE = 'wl.work_profile';
+    const SCOPE_APPLICATIONS = 'wl.applications';
+    const SCOPE_APPLICATIONS_CREATE = 'wl.applications_create';
+    const SCOPE_IMAP = 'wl.imap';
+
+    /**
+     * MS uses some magical not officialy supported scope to get even moar info like full emailaddresses.
+     * They agree that giving 3rd party apps access to 3rd party emailaddresses is a pretty lame thing to do so in all
+     * their wisdom they added this scope because fuck you that's why.
+     *
+     * https://github.com/Lusitanian/PHPoAuthLib/issues/214
+     * http://social.msdn.microsoft.com/Forums/live/en-US/c6dcb9ab-aed4-400a-99fb-5650c393a95d/how-retrieve-users-
+     *                                  contacts-email-address?forum=messengerconnect
+     *
+     * Considering this scope is not officially supported: use with care
+     */
+    const SCOPE_CONTACTS_EMAILS = 'wl.contacts_emails';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://apis.live.net/v5.0/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://login.live.com/oauth20_authorize.srf');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://login.live.com/oauth20_token.srf');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Nest.php b/htdocs/includes/OAuth/OAuth2/Service/Nest.php
new file mode 100644
index 00000000000..7659e4fb74b
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Nest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Nest service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developer.nest.com/documentation
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Nest service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developer.nest.com/documentation
+ */
+class Nest extends AbstractService
+{
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://developer-api.nest.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://home.nest.com/login/oauth2');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.home.nest.com/oauth2/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING_V4;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Netatmo.php b/htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
new file mode 100644
index 00000000000..eb5c68d9eb6
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Netatmo.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Netatmo service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://dev.netatmo.com/doc/
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Netatmo service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://dev.netatmo.com/doc/
+ */
+class Netatmo extends AbstractService
+{
+
+    // SCOPES
+    // @link https://dev.netatmo.com/doc/authentication/scopes
+
+    // Used to read weather station's data (devicelist, getmeasure)
+    const SCOPE_STATION_READ        = 'read_station';
+    // Used to read thermostat's data (devicelist, getmeasure, getthermstate)
+    const SCOPE_THERMOSTAT_READ     = 'read_thermostat';
+    // Used to configure the thermostat (syncschedule, setthermpoint)
+    const SCOPE_THERMOSTAT_WRITE    = 'write_thermostat';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true // use parameter state
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.netatmo.net/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri($this->baseApiUri.'oauth2/authorize');
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri.'oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php b/htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
new file mode 100644
index 00000000000..78ef94257c0
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/ParrotFlowerPower.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * ParrotFlowerPower service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://flowerpowerdev.parrot.com/projects/flower-power-web-service-api/wiki
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth2\Service\Exception\MissingRefreshTokenException;
+use OAuth\Common\Token\TokenInterface;
+
+/**
+ * ParrotFlowerPower service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://flowerpowerdev.parrot.com/projects/flower-power-web-service-api/wiki
+ */
+class ParrotFlowerPower extends AbstractService
+{
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://apiflowerpower.parrot.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri($this->baseApiUri.'oauth2/v1/authorize');
+
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri($this->baseApiUri.'user/v1/authenticate');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+
+    /**
+     * Parrot use a different endpoint for refresh a token
+     *
+     * {@inheritdoc}
+     */
+    public function refreshAccessToken(TokenInterface $token)
+    {
+        $refreshToken = $token->getRefreshToken();
+
+        if (empty($refreshToken)) {
+            throw new MissingRefreshTokenException();
+        }
+
+        $parameters = array(
+            'grant_type'    => 'refresh_token',
+            'type'          => 'web_server',
+            'client_id'     => $this->credentials->getConsumerId(),
+            'client_secret' => $this->credentials->getConsumerSecret(),
+            'refresh_token' => $refreshToken,
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            new Uri($this->baseApiUri.'user/v1/refresh'),
+            $parameters,
+            $this->getExtraOAuthHeaders()
+        );
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Paypal.php b/htdocs/includes/OAuth/OAuth2/Service/Paypal.php
new file mode 100644
index 00000000000..761c09d6696
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Paypal.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * PayPal service.
+ *
+ * @author Flávio Heleno <flaviohbatista@gmail.com>
+ * @link https://developer.paypal.com/webapps/developer/docs/integration/direct/log-in-with-paypal/detailed/
+ */
+class Paypal extends AbstractService
+{
+    /**
+     * Defined scopes
+     * @link https://developer.paypal.com/webapps/developer/docs/integration/direct/log-in-with-paypal/detailed/
+     * @see  #attributes
+     */
+    const SCOPE_OPENID           = 'openid';
+    const SCOPE_PROFILE          = 'profile';
+    const SCOPE_PAYPALATTRIBUTES = 'https://uri.paypal.com/services/paypalattributes';
+    const SCOPE_EMAIL            = 'email';
+    const SCOPE_ADDRESS          = 'address';
+    const SCOPE_PHONE            = 'phone';
+    const SCOPE_EXPRESSCHECKOUT  = 'https://uri.paypal.com/services/expresscheckout';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.paypal.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.paypal.com/webapps/auth/protocol/openidconnect/v1/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.paypal.com/v1/identity/openidconnect/tokenservice');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['message'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['message'] . '"');
+        } elseif (isset($data['name'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['name'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Pocket.php b/htdocs/includes/OAuth/OAuth2/Service/Pocket.php
new file mode 100644
index 00000000000..8c955440e27
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Pocket.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+
+class Pocket extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+        if ($baseApiUri === null) {
+            $this->baseApiUri = new Uri('https://getpocket.com/v3/');
+        }
+    }
+    
+    public function getRequestTokenEndpoint()
+    {
+        return new Uri('https://getpocket.com/v3/oauth/request');
+    }
+    
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://getpocket.com/auth/authorize');
+    }
+    
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://getpocket.com/v3/oauth/authorize');
+    }
+    
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'redirect_uri' => $this->credentials->getCallbackUrl(),
+            )
+        );
+        
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+    
+    public function requestRequestToken()
+    {
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getRequestTokenEndpoint(),
+            array(
+                'consumer_key' => $this->credentials->getConsumerId(),
+                'redirect_uri' => $this->credentials->getCallbackUrl(),
+            )
+        );
+        
+        $code = $this->parseRequestTokenResponse($responseBody);
+
+        return $code;
+    }
+    
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+        
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['code'])) {
+            throw new TokenResponseException('Error in retrieving code.');
+        }
+        return $data['code'];
+    }
+    
+    public function requestAccessToken($code)
+    {
+        $bodyParams = array(
+            'consumer_key'     => $this->credentials->getConsumerId(),
+            'code'             => $code,
+        );
+
+        $responseBody = $this->httpClient->retrieveResponse(
+            $this->getAccessTokenEndpoint(),
+            $bodyParams,
+            $this->getExtraOAuthHeaders()
+        );
+        $token = $this->parseAccessTokenResponse($responseBody);
+        $this->storage->storeAccessToken($this->service(), $token);
+
+        return $token;
+    }
+    
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+        
+        if ($data === null || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+        
+        $token = new StdOAuth2Token();
+        #$token->setRequestToken($data['access_token']);
+        $token->setAccessToken($data['access_token']);
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+        $token->setExtraParams($data);
+        
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Reddit.php b/htdocs/includes/OAuth/OAuth2/Service/Reddit.php
new file mode 100644
index 00000000000..9e524d12144
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Reddit.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Reddit extends AbstractService
+{
+    /**
+     * Defined scopes
+     *
+     * @link http://www.reddit.com/dev/api/oauth
+     */
+    // User scopes
+    const SCOPE_EDIT                         = 'edit';
+    const SCOPE_HISTORY                      = 'history';
+    const SCOPE_IDENTITY                     = 'identity';
+    const SCOPE_MYSUBREDDITS                 = 'mysubreddits';
+    const SCOPE_PRIVATEMESSAGES              = 'privatemessages';
+    const SCOPE_READ                         = 'read';
+    const SCOPE_SAVE                         = 'save';
+    const SCOPE_SUBMIT                       = 'submit';
+    const SCOPE_SUBSCRIBE                    = 'subscribe';
+    const SCOPE_VOTE                         = 'vote';
+    // Mod Scopes
+    const SCOPE_MODCONFIG                    = 'modconfig';
+    const SCOPE_MODFLAIR                     = 'modflair';
+    const SCOPE_MODLOG                       = 'modlog';
+    const SCOPE_MODPOST                      = 'modpost';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://oauth.reddit.com');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://ssl.reddit.com/api/v1/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://ssl.reddit.com/api/v1/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        // Reddit uses a Basic OAuth header
+        return array('Authorization' => 'Basic ' .
+            base64_encode($this->credentials->getConsumerId() . ':' . $this->credentials->getConsumerSecret()));
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php b/htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
new file mode 100644
index 00000000000..715840767fe
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/RunKeeper.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * RunKeeper service.
+ *
+ * @link http://runkeeper.com/developer/healthgraph/registration-authorization
+ */
+class RunKeeper extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.runkeeper.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationUri(array $additionalParameters = array())
+    {
+        $parameters = array_merge(
+            $additionalParameters,
+            array(
+                'client_id'     => $this->credentials->getConsumerId(),
+                'redirect_uri'  => $this->credentials->getCallbackUrl(),
+                'response_type' => 'code',
+            )
+        );
+
+        $parameters['scope'] = implode(' ', $this->scopes);
+
+        // Build the url
+        $url = clone $this->getAuthorizationEndpoint();
+        foreach ($parameters as $key => $val) {
+            $url->addToQuery($key, $val);
+        }
+
+        return $url;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://runkeeper.com/apps/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://runkeeper.com/apps/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Salesforce.php b/htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
new file mode 100644
index 00000000000..a50de1123a4
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Salesforce.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Service\AbstractService;
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Salesforce extends AbstractService
+{
+    /**
+     * Scopes
+     *
+     * @var string
+     */
+    const   SCOPE_API           =   'api',
+            SCOPE_REFRESH_TOKEN =   'refresh_token';
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://login.salesforce.com/services/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://na1.salesforce.com/services/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseRequestTokenResponse($responseBody)
+    {
+        parse_str($responseBody, $data);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true') {
+            throw new TokenResponseException('Error in retrieving token.');
+        }
+
+        return $this->parseAccessTokenResponse($responseBody);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        // Salesforce tokens evidently never expire...
+        $token->setEndOfLife(StdOAuth2Token::EOL_NEVER_EXPIRES);
+        unset($data['access_token']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => 'application/json');
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php b/htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
new file mode 100644
index 00000000000..e689a4c0d3a
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/ServiceInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Token\TokenInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Service\ServiceInterface as BaseServiceInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Defines the common methods across OAuth 2 services.
+ */
+interface ServiceInterface extends BaseServiceInterface
+{
+    /**
+     * Authorization methods for various services
+     */
+    const AUTHORIZATION_METHOD_HEADER_OAUTH    = 0;
+    const AUTHORIZATION_METHOD_HEADER_BEARER   = 1;
+    const AUTHORIZATION_METHOD_QUERY_STRING    = 2;
+    const AUTHORIZATION_METHOD_QUERY_STRING_V2 = 3;
+    const AUTHORIZATION_METHOD_QUERY_STRING_V3 = 4;
+    const AUTHORIZATION_METHOD_QUERY_STRING_V4 = 5;
+
+    /**
+     * Retrieves and stores/returns the OAuth2 access token after a successful authorization.
+     *
+     * @param string $code The access code from the callback.
+     *
+     * @return TokenInterface $token
+     *
+     * @throws TokenResponseException
+     */
+    public function requestAccessToken($code);
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php b/htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
new file mode 100644
index 00000000000..32a3b46c785
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/SoundCloud.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class SoundCloud extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.soundcloud.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://soundcloud.com/connect');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.soundcloud.com/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifetime($data['expires_in']);
+            unset($data['expires_in']);
+        }
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Spotify.php b/htdocs/includes/OAuth/OAuth2/Service/Spotify.php
new file mode 100644
index 00000000000..5baf7aef7ae
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Spotify.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Spotify extends AbstractService
+{
+    /**
+     * Scopes
+     *
+     * @var string
+     */
+    const SCOPE_PLAYLIST_MODIFY_PUBLIC = 'playlist-modify-public';
+    const SCOPE_PLAYLIST_MODIFY_PRIVATE = 'playlist-modify-private';
+    const SCOPE_PLAYLIST_READ_PRIVATE = 'playlist-read-private';
+    const SCOPE_STREAMING = 'streaming';
+    const SCOPE_USER_LIBRARY_MODIFY = 'user-library-modify';
+    const SCOPE_USER_LIBRARY_READ = 'user-library-read';
+    const SCOPE_USER_READ_PRIVATE = 'user-read-private';
+    const SCOPE_USER_READ_EMAIL = 'user-read-email';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.spotify.com/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://accounts.spotify.com/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://accounts.spotify.com/api/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifetime($data['expires_in']);
+            unset($data['expires_in']);
+        }
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Authorization' => 'Basic ' .
+            base64_encode($this->credentials->getConsumerId() . ':' . $this->credentials->getConsumerSecret()));
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Strava.php b/htdocs/includes/OAuth/OAuth2/Service/Strava.php
new file mode 100644
index 00000000000..208ec635913
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Strava.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Strava service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    http://strava.github.io/
+ * @link    http://strava.github.io/api/v3/oauth/
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\OAuth2\Service\Exception\InvalidAccessTypeException;
+
+/**
+ * Strava service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    http://strava.github.io/
+ * @link    http://strava.github.io/api/v3/oauth/
+ */
+class Strava extends AbstractService
+{
+    /**
+     * Scopes
+     */
+    // default
+    const SCOPE_PUBLIC       = 'public';
+    // Modify activities, upload on the user’s behalf
+    const SCOPE_WRITE        = 'write';
+    // View private activities and data within privacy zones
+    const SCOPE_VIEW_PRIVATE = 'view_private';
+
+    protected $approvalPrompt = 'auto';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        if (empty($scopes)) {
+            $scopes = array(self::SCOPE_PUBLIC);
+        }
+
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://www.strava.com/api/v3/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.strava.com/oauth/authorize?approval_prompt=' . $this->approvalPrompt);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.strava.com/oauth/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error_description'] . '"'
+            );
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifeTime($data['expires_in']);
+            unset($data['expires_in']);
+        }
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    public function setApprouvalPrompt($prompt)
+    {
+        if (!in_array($prompt, array('auto', 'force'), true)) {
+            // @todo Maybe could we rename this exception
+            throw new InvalidAccessTypeException('Invalid approuvalPrompt, expected either auto or force.');
+        }
+        $this->approvalPrompt = $prompt;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getScopesDelimiter()
+    {
+        return ',';
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Ustream.php b/htdocs/includes/OAuth/OAuth2/Service/Ustream.php
new file mode 100644
index 00000000000..7e5581532a3
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Ustream.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Ustream extends AbstractService
+{
+    /**
+     * Scopes
+     *
+     * @var string
+     */
+    const SCOPE_OFFLINE     = 'offline';
+    const SCOPE_BROADCASTER = 'broadcaster';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri, true);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.ustream.tv/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.ustream.tv/oauth2/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.ustream.tv/oauth2/token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Authorization' => 'Basic ' . $this->credentials->getConsumerSecret());
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Vimeo.php b/htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
new file mode 100644
index 00000000000..2efe6b254ba
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Vimeo.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Vimeo service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developer.vimeo.com/
+ * @link    https://developer.vimeo.com/api/authentication
+ */
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+/**
+ * Vimeo service.
+ *
+ * @author  Pedro Amorim <contact@pamorim.fr>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link    https://developer.vimeo.com/
+ * @link    https://developer.vimeo.com/api/authentication
+ */
+class Vimeo extends AbstractService
+{
+    // API version
+    const VERSION = '3.2';
+    // API Header Accept
+    const HEADER_ACCEPT = 'application/vnd.vimeo.*+json;version=3.2';
+
+    /**
+     * Scopes
+     * @see  https://developer.vimeo.com/api/authentication#scope
+     */
+    // View public videos
+    const SCOPE_PUBLIC    = 'public';
+    // View private videos
+    const SCOPE_PRIVATE   = 'private';
+    // View Vimeo On Demand purchase history
+    const SCOPE_PURCHASED = 'purchased';
+    // Create new videos, groups, albums, etc.
+    const SCOPE_CREATE    = 'create';
+    // Edit videos, groups, albums, etc.
+    const SCOPE_EDIT      = 'edit';
+    // Delete videos, groups, albums, etc.
+    const SCOPE_DELETE    = 'delete';
+    // Interact with a video on behalf of a user, such as liking
+    // a video or adding it to your watch later queue
+    const SCOPE_INTERACT  = 'interact';
+    // Upload a video
+    const SCOPE_UPLOAD    = 'upload';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct(
+            $credentials,
+            $httpClient,
+            $storage,
+            $scopes,
+            $baseApiUri,
+            true
+        );
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.vimeo.com/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.vimeo.com/oauth/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.vimeo.com/oauth/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error_description'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error_description'] . '"'
+            );
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException(
+                'Error in retrieving token: "' . $data['error'] . '"'
+            );
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+
+        if (isset($data['expires_in'])) {
+            $token->setLifeTime($data['expires_in']);
+            unset($data['expires_in']);
+        }
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraOAuthHeaders()
+    {
+        return array('Accept' => self::HEADER_ACCEPT);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getExtraApiHeaders()
+    {
+        return array('Accept' => self::HEADER_ACCEPT);
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php b/htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
new file mode 100644
index 00000000000..4a7744ecad7
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Vkontakte.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Vkontakte extends AbstractService
+{
+    /**
+     * Defined scopes
+     *
+     * @link http://vk.com/dev/permissions
+     */
+    const SCOPE_EMAIL         = 'email';
+    const SCOPE_NOTIFY        = 'notify';
+    const SCOPE_FRIENDS       = 'friends';
+    const SCOPE_PHOTOS        = 'photos';
+    const SCOPE_AUDIO         = 'audio';
+    const SCOPE_VIDEO         = 'video';
+    const SCOPE_DOCS          = 'docs';
+    const SCOPE_NOTES         = 'notes';
+    const SCOPE_PAGES         = 'pages';
+    const SCOPE_APP_LINK      = '';
+    const SCOPE_STATUS        = 'status';
+    const SCOPE_OFFERS        = 'offers';
+    const SCOPE_QUESTIONS     = 'questions';
+    const SCOPE_WALL          = 'wall';
+    const SCOPE_GROUPS        = 'groups';
+    const SCOPE_MESSAGES      = 'messages';
+    const SCOPE_NOTIFICATIONS = 'notifications';
+    const SCOPE_STATS         = 'stats';
+    const SCOPE_ADS           = 'ads';
+    const SCOPE_OFFLINE       = 'offline';
+    const SCOPE_NOHTTPS       = 'nohttps';
+
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://api.vk.com/method/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://oauth.vk.com/authorize');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://oauth.vk.com/access_token');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifeTime($data['expires_in']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+    
+    /**
+     * {@inheritdoc}
+     */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_QUERY_STRING;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Yahoo.php b/htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
new file mode 100644
index 00000000000..270e240325e
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Yahoo.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+
+class Yahoo extends AbstractService
+{
+
+    /**
+    * {@inheritdoc}
+    */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://api.login.yahoo.com/oauth2/request_auth');
+    }
+
+    /**
+    * {@inheritdoc}
+    */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://api.login.yahoo.com/oauth2/get_token');
+    }
+
+    /**
+    * {@inheritdoc}
+    */
+    protected function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+    * {@inheritdoc}
+    */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data))
+        {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error']))
+        {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']);
+        $token->setLifetime($data['expires_in']);
+
+        if (isset($data['refresh_token']))
+        {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+
+    /**
+    * {@inheritdoc}
+    */
+    protected function getExtraOAuthHeaders()
+    {
+        $encodedCredentials = base64_encode($this->credentials->getConsumerId() . ':' . $this->credentials->getConsumerSecret());
+        return array('Authorization' => 'Basic ' . $encodedCredentials);
+    }
+
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Service/Yammer.php b/htdocs/includes/OAuth/OAuth2/Service/Yammer.php
new file mode 100644
index 00000000000..994a2935432
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Service/Yammer.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace OAuth\OAuth2\Service;
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+use OAuth\Common\Http\Exception\TokenResponseException;
+use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Uri\UriInterface;
+
+class Yammer extends AbstractService
+{
+    public function __construct(
+        CredentialsInterface $credentials,
+        ClientInterface $httpClient,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null
+    ) {
+        parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri);
+
+        if (null === $baseApiUri) {
+            $this->baseApiUri = new Uri('https://www.yammer.com/api/v1/');
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationEndpoint()
+    {
+        return new Uri('https://www.yammer.com/dialog/oauth');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAccessTokenEndpoint()
+    {
+        return new Uri('https://www.yammer.com/oauth2/access_token.json');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAuthorizationMethod()
+    {
+        return static::AUTHORIZATION_METHOD_HEADER_BEARER;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function parseAccessTokenResponse($responseBody)
+    {
+        $data = json_decode($responseBody, true);
+
+        if (null === $data || !is_array($data)) {
+            throw new TokenResponseException('Unable to parse response.');
+        } elseif (isset($data['error'])) {
+            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        }
+
+        $token = new StdOAuth2Token();
+        $token->setAccessToken($data['access_token']['token']);
+        $token->setLifetime($data['access_token']['expires_at']);
+
+        if (isset($data['refresh_token'])) {
+            $token->setRefreshToken($data['refresh_token']);
+            unset($data['refresh_token']);
+        }
+
+        unset($data['access_token']);
+        unset($data['expires_in']);
+
+        $token->setExtraParams($data);
+
+        return $token;
+    }
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php b/htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
new file mode 100644
index 00000000000..eaaacac778b
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Token/StdOAuth2Token.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace OAuth\OAuth2\Token;
+
+use OAuth\Common\Token\AbstractToken;
+
+/**
+ * Standard OAuth2 token implementation.
+ * Implements OAuth\OAuth2\Token\TokenInterface for any functionality that might not be provided by AbstractToken.
+ */
+class StdOAuth2Token extends AbstractToken implements TokenInterface
+{
+}
diff --git a/htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php b/htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
new file mode 100644
index 00000000000..aa592aa126d
--- /dev/null
+++ b/htdocs/includes/OAuth/OAuth2/Token/TokenInterface.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace OAuth\OAuth2\Token;
+
+use OAuth\Common\Token\TokenInterface as BaseTokenInterface;
+
+interface TokenInterface extends BaseTokenInterface
+{
+}
diff --git a/htdocs/includes/OAuth/ServiceFactory.php b/htdocs/includes/OAuth/ServiceFactory.php
new file mode 100644
index 00000000000..cdb244065f5
--- /dev/null
+++ b/htdocs/includes/OAuth/ServiceFactory.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * OAuth service factory.
+ *
+ * PHP version 5.4
+ *
+ * @category   OAuth
+ * @author     David Desberg <david@daviddesberg.com>
+ * @author     Pieter Hordijk <info@pieterhordijk.com>
+ * @copyright  Copyright (c) 2013 The authors
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+namespace OAuth;
+
+use OAuth\Common\Service\ServiceInterface;
+use OAuth\Common\Consumer\CredentialsInterface;
+use OAuth\Common\Storage\TokenStorageInterface;
+use OAuth\Common\Http\Client\ClientInterface;
+use OAuth\Common\Http\Client\StreamClient;
+use OAuth\Common\Http\Uri\UriInterface;
+use OAuth\Common\Exception\Exception;
+use OAuth\OAuth1\Signature\Signature;
+
+class ServiceFactory
+{
+    /**
+     *@var ClientInterface
+     */
+    protected $httpClient;
+
+    /**
+     * @var array
+     */
+    protected $serviceClassMap = array(
+        'OAuth1' => array(),
+        'OAuth2' => array()
+    );
+
+    /**
+     * @var array
+     */
+    protected $serviceBuilders = array(
+        'OAuth2' => 'buildV2Service',
+        'OAuth1' => 'buildV1Service',
+    );
+
+    /**
+     * @param ClientInterface $httpClient
+     *
+     * @return ServiceFactory
+     */
+    public function setHttpClient(ClientInterface $httpClient)
+    {
+        $this->httpClient = $httpClient;
+
+        return $this;
+    }
+
+    /**
+     * Register a custom service to classname mapping.
+     *
+     * @param string $serviceName Name of the service
+     * @param string $className   Class to instantiate
+     *
+     * @return ServiceFactory
+     *
+     * @throws Exception If the class is nonexistent or does not implement a valid ServiceInterface
+     */
+    public function registerService($serviceName, $className)
+    {
+        if (!class_exists($className)) {
+            throw new Exception(sprintf('Service class %s does not exist.', $className));
+        }
+
+        $reflClass = new \ReflectionClass($className);
+
+        foreach (array('OAuth2', 'OAuth1') as $version) {
+            if ($reflClass->implementsInterface('OAuth\\' . $version . '\\Service\\ServiceInterface')) {
+                $this->serviceClassMap[$version][ucfirst($serviceName)] = $className;
+
+                return $this;
+            }
+        }
+
+        throw new Exception(sprintf('Service class %s must implement ServiceInterface.', $className));
+    }
+
+    /**
+     * Builds and returns oauth services
+     *
+     * It will first try to build an OAuth2 service and if none found it will try to build an OAuth1 service
+     *
+     * @param string                $serviceName Name of service to create
+     * @param CredentialsInterface  $credentials
+     * @param TokenStorageInterface $storage
+     * @param array|null            $scopes      If creating an oauth2 service, array of scopes
+     * @param UriInterface|null     $baseApiUri
+     * @param string                $apiVersion version of the api call
+     *
+     * @return ServiceInterface
+     */
+    public function createService(
+        $serviceName,
+        CredentialsInterface $credentials,
+        TokenStorageInterface $storage,
+        $scopes = array(),
+        UriInterface $baseApiUri = null,
+        $apiVersion = ""
+    ) {
+        if (!$this->httpClient) {
+            // for backwards compatibility.
+            $this->httpClient = new StreamClient();
+        }
+
+        foreach ($this->serviceBuilders as $version => $buildMethod) {
+            $fullyQualifiedServiceName = $this->getFullyQualifiedServiceName($serviceName, $version);
+
+            if (class_exists($fullyQualifiedServiceName)) {
+                return $this->$buildMethod(
+                    $fullyQualifiedServiceName,
+                    $credentials,
+                    $storage,
+                    $scopes,
+                    $baseApiUri,
+                    $apiVersion
+                );
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the fully qualified name of the service
+     *
+     * @param string $serviceName The name of the service of which to get the fully qualified name
+     * @param string $type        The type of the service to get (either OAuth1 or OAuth2)
+     *
+     * @return string The fully qualified name of the service
+     */
+    private function getFullyQualifiedServiceName($serviceName, $type)
+    {
+        $serviceName = ucfirst($serviceName);
+
+        if (isset($this->serviceClassMap[$type][$serviceName])) {
+            return $this->serviceClassMap[$type][$serviceName];
+        }
+
+        return '\\OAuth\\' . $type . '\\Service\\' . $serviceName;
+    }
+
+    /**
+     * Builds v2 services
+     *
+     * @param string                $serviceName The fully qualified service name
+     * @param CredentialsInterface  $credentials
+     * @param TokenStorageInterface $storage
+     * @param array|null            $scopes      Array of scopes for the service
+     * @param UriInterface|null     $baseApiUri
+     *
+     * @return ServiceInterface
+     *
+     * @throws Exception
+     */
+    private function buildV2Service(
+        $serviceName,
+        CredentialsInterface $credentials,
+        TokenStorageInterface $storage,
+        array $scopes,
+        UriInterface $baseApiUri = null,
+        $apiVersion = ""
+    ) {
+        return new $serviceName(
+            $credentials,
+            $this->httpClient,
+            $storage,
+            $this->resolveScopes($serviceName, $scopes),
+            $baseApiUri,
+            $apiVersion
+        );
+    }
+
+    /**
+     * Resolves scopes for v2 services
+     *
+     * @param string  $serviceName The fully qualified service name
+     * @param array   $scopes      List of scopes for the service
+     *
+     * @return array List of resolved scopes
+     */
+    private function resolveScopes($serviceName, array $scopes)
+    {
+        $reflClass = new \ReflectionClass($serviceName);
+        $constants = $reflClass->getConstants();
+
+        $resolvedScopes = array();
+        foreach ($scopes as $scope) {
+            $key = strtoupper('SCOPE_' . $scope);
+
+            if (array_key_exists($key, $constants)) {
+                $resolvedScopes[] = $constants[$key];
+            } else {
+                $resolvedScopes[] = $scope;
+            }
+        }
+
+        return $resolvedScopes;
+    }
+
+    /**
+     * Builds v1 services
+     *
+     * @param string                $serviceName The fully qualified service name
+     * @param CredentialsInterface  $credentials
+     * @param TokenStorageInterface $storage
+     * @param array                 $scopes
+     * @param UriInterface          $baseApiUri
+     *
+     * @return ServiceInterface
+     *
+     * @throws Exception
+     */
+    private function buildV1Service(
+        $serviceName,
+        CredentialsInterface $credentials,
+        TokenStorageInterface $storage,
+        $scopes,
+        UriInterface $baseApiUri = null
+    ) {
+        if (!empty($scopes)) {
+            throw new Exception(
+                'Scopes passed to ServiceFactory::createService but an OAuth1 service was requested.'
+            );
+        }
+
+        return new $serviceName($credentials, $this->httpClient, $storage, new Signature($credentials), $baseApiUri);
+    }
+}
diff --git a/htdocs/includes/OAuth/bootstrap.php b/htdocs/includes/OAuth/bootstrap.php
new file mode 100644
index 00000000000..548678aa115
--- /dev/null
+++ b/htdocs/includes/OAuth/bootstrap.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * Bootstrap the library.
+ */
+
+namespace OAuth;
+
+require_once __DIR__ . '/Common/AutoLoader.php';
+
+$autoloader = new Common\AutoLoader(__NAMESPACE__, dirname(__DIR__));
+
+$autoloader->register();
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
new file mode 100644
index 00000000000..a45f9920dea
--- /dev/null
+++ b/htdocs/langs/en_US/oauth.lang
@@ -0,0 +1,128 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Oauth Configuration
+OAUTH_AMAZON_NAME=Api Amazon
+OAUTH_AMAZON_ID=Api Amazon Id
+OAUTH_AMAZON_SECRET=Api Amazon Secret
+OAUTH_BITBUCKET_NAME=Api Bitbucket
+OAUTH_BITBUCKET_ID=Api Bitbucket Id
+OAUTH_BITBUCKET_SECRET=Api Bitbucket Secret
+OAUTH_BITLY_NAME=Api Bitly
+OAUTH_BITLY_ID=Api Bitly Id
+OAUTH_BITLY_SECRET=Api Bitly Secret
+OAUTH_BITRIX24_NAME=Api Bitrix24
+OAUTH_BITRIX24_ID=Api Bitrix24 Id
+OAUTH_BITRIX24_SECRET=Api Bitrix24 Secret
+OAUTH_BOX_NAME=Api Box
+OAUTH_BOX_ID=Api Box Id
+OAUTH_BOX_SECRET=Api Box Secret
+OAUTH_BUFFER_NAME=Api Buffer
+OAUTH_BUFFER_ID=Api Buffer Id
+OAUTH_BUFFER_SECRET=Api Buffer Secret
+OAUTH_DAILYMOTION_NAME=Api Daylymotion
+OAUTH_DAILYMOTION_ID=Api Daylymotion Id
+OAUTH_DAILYMOTION_SECRET=Api Daylymotion Secret
+OAUTH_DEVIANTART_NAME=Api DeviantArt
+OAUTH_DEVIANTART_ID=Api DeviantArt Id
+OAUTH_DEVIANTART_SECRET=Api DeviantArt Secret
+OAUTH_DROPBOX_NAME=Api Dropbox
+OAUTH_DROPBOX_ID=Api Dropbox Id
+OAUTH_DROPBOX_SECRET=Api Dropbox Secret
+OAUTH_ETSY_NAME=Api Etsy
+OAUTH_ETSY_ID=Api Etsy Id
+OAUTH_ETSY_SECRET=Api Etsy Secret
+OAUTH_EVEONLINE_NAME=Api EveOnline
+OAUTH_EVEONLINE_ID=Api EveOnline Id
+OAUTH_EVEONLINE_SECRET=Api EveOnline Secret
+OAUTH_FACEBOOK_NAME=Api Facebook
+OAUTH_FACEBOOK_ID=Api Facebook Id
+OAUTH_FACEBOOK_SECRET=Api Facebook Secret
+OAUTH_FITBIT_NAME=Api FitBit
+OAUTH_FITBIT_ID=Api FitBit Id
+OAUTH_FITBIT_SECRET=Api FitBit Secret
+OAUTH_FIVEHUNDREDPX_NAME=Api 500px
+OAUTH_FIVEHUNDREDPX_ID=Api 500px Id
+OAUTH_FIVEHUNDREDPX_SECRET=Api 500px Secret
+OAUTH_FLICKR_NAME=Api Flickr
+OAUTH_FLICKR_ID=Api Flickr Id
+OAUTH_FLICKR_SECRET=Api Flickr Secret
+OAUTH_FOURSQUARE_NAME=Api Foursquare
+OAUTH_FOURSQUARE_ID=Api Foursquare Id
+OAUTH_FOURSQUARE_SECRET=Api Foursquare Secret
+OAUTH_GITHUB_NAME=Api Github
+OAUTH_GITHUB_ID=Api Github Id
+OAUTH_GITHUB_SECRET=Api Github Secret
+OAUTH_GOOGLE_NAME=Api Google
+OAUTH_GOOGLE_ID=Api Google Id
+OAUTH_GOOGLE_SECRET=Api Google Secret
+OAUTH_HUBIC_NAME=Api Hubic
+OAUTH_HUBIC_ID=Api Hubic Id
+OAUTH_HUBIC_SECRET=Api Hubic Secret
+OAUTH_INSTAGRAM_NAME=Api Instagram
+OAUTH_INSTAGRAM_ID=Api Instagram Id
+OAUTH_INSTAGRAM_SECRET=Api Instagram Secret
+OAUTH_LINKEDIN_NAME=Api Linkedin
+OAUTH_LINKEDIN_ID=Api Linkedin Id
+OAUTH_LINKEDIN_SECRET=Api Linkedin Secret
+OAUTH_MAILCHIMP_NAME=Api Mailchimp
+OAUTH_MAILCHIMP_ID=Api Mailchimp Id
+OAUTH_MAILCHIMP_SECRET=Api Mailchimp Secret
+OAUTH_MICROSOFT_NAME=Api Microsoft
+OAUTH_MICROSOFT_ID=Api Microsoft Id
+OAUTH_MICROSOFT_SECRET=Api Microsoft Secret
+OAUTH_NEST_NAME=Api Nest
+OAUTH_NEST_ID=Api Nest Id
+OAUTH_NEST_SECRET=Api Nest Secret
+OAUTH_NETATMO_NAME=Api Netatmo
+OAUTH_NETATMO_ID=Api Netatmo Id
+OAUTH_NETATMO_SECRET=Api Netatmo Secret
+OAUTH_PARROTFLOWERPOWER_NAME=Api Parrot Flower Power
+OAUTH_PARROTFLOWERPOWER_ID=Api Parrot Flower Power Id
+OAUTH_PARROTFLOWERPOWER_SECRET=Api Parrot Flower Power Secret
+OAUTH_PAYPAL_NAME=Api Paypal
+OAUTH_PAYPAL_ID=Api Paypal Id
+OAUTH_PAYPAL_SECRET=Api Paypal Secret
+OAUTH_POCKET_NAME=Api Pocket
+OAUTH_POCKET_ID=Api Pocket Id
+OAUTH_POCKET_SECRET=Api Pocket Secret
+OAUTH_QUICKBOOKS_NAME=Api Quickbooks
+OAUTH_QUICKBOOKS_ID=Api Quickbooks Id
+OAUTH_QUICKBOOKS_SECRET=Api Quickbooks Secret
+OAUTH_REDDIT_NAME=Api Reddit
+OAUTH_REDDIT_ID=Api Reddit Id
+OAUTH_REDDIT_SECRET=Api Reddit Secret
+OAUTH_REDMINE_NAME=Api Redmine
+OAUTH_REDMINE_ID=Api Redmine Id
+OAUTH_REDMINE_SECRET=Api Redmine Secret
+OAUTH_RUNKEEPER_NAME=Api Runkeeper
+OAUTH_RUNKEEPER_ID=Api Runkeeper Id
+OAUTH_RUNKEEPER_SECRET=Api Runkeeper Secret
+OAUTH_SCOOPIT_NAME=Api Scoopit
+OAUTH_SCOOPIT_ID=Api Scoopit Id
+OAUTH_SCOOPIT_SECRET=Api Scoopit Secret
+OAUTH_SOUNDCLOUD_NAME=Api Soundcloud
+OAUTH_SOUNDCLOUD_ID=Api Soundcloud Id
+OAUTH_SOUNDCLOUD_SECRET=Api Soundcloud Secret
+OAUTH_SPOTIFY_NAME=Api Spotify
+OAUTH_SPOTIFY_ID=Api Spotify id
+OAUTH_SPOTIFY_SECRET=Api Spotify Secret
+OAUTH_STRAVA_NAME=Api Strava
+OAUTH_STRAVA_ID=Api Strava Id
+OAUTH_STRAVA_SECRET=Api Strava Secret
+OAUTH_TUMBLR_NAME=Api Tumblr
+OAUTH_TUMBLR_ID=Api Tumblr Id
+OAUTH_TUMBLR_SECRET=Api Tumblr Secret
+OAUTH_TWITTER_NAME=Api Twitter
+OAUTH_TWITTER_ID=Api Twitter Id
+OAUTH_TWITTER_SECRET=Api Twitter Secret
+OAUTH_USTREAM_NAME=Api Ustream
+OAUTH_USTREAM_ID=Api Ustream Id
+OAUTH_USTREAM_SECRET=Api Ustream Secret
+OAUTH_VIMEO_NAME=Api Vimeo
+OAUTH_VIMEO_ID=Api Vimeo Id
+OAUTH_VIMEO_SECRET=Api Vimeo Secret
+OAUTH_YAHOO_NAME=Api Yahoo
+OAUTH_YAHOO_ID=Api Yahoo Id
+OAUTH_YAHOO_SECRET=Api Yahoo Secret
+OAUTH_YAMMER_NAME=Api Yammer
+OAUTH_YAMMER_ID=Api Yammer Id
+OAUTH_YAMMER_SECRET=Api Yammer Secret
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index a81355efe38..c41a1a9a20a 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -18,6 +18,9 @@ TestDriver=Test
 TargetedPrinter=Targeted printer
 UserConf=Setup per user
 PRINTGCP=Google Cloud Print
+PRINTGCP_INFO=Google Api State
+PRINTGCP_AUTHLINK=Authentication
+RequestAccess=Request Access
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 872ddd9f5dd..a779582d108 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014 Frederic France      <frederic.france@free.fr>
+/* Copyright (C) 2013       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
@@ -126,7 +126,9 @@ if ($mode == 'setup' && $user->admin)
     print '<tr class="liste_titre">';
     print '<th>'.$langs->trans("Parameters").'</th>';
     print '<th>'.$langs->trans("Value").'</th>';
+    print '<th>&nbsp;</th>';
     print "</tr>\n";
+    $submit_enabled=0;
 
     if (! empty($driver))
     {
@@ -136,17 +138,39 @@ if ($mode == 'setup' && $user->admin)
         $printer = new $classname($db);
         //print '<pre>'.print_r($printer, true).'</pre>';
         $i=0;
+        $submit_enabled=0;
         foreach ($printer->conf as $key)
         {
             $var=!$var;
-            print '<tr '.$bc[$var].'>';
-            print '<td'.($key['required']?' class=required':'').'>'.$langs->trans($key['varname']).'</td><td>';
-            print '<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']:'';
-            print '>';
-            print '<input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'">';
-            print '&nbsp;'.($key['example']!=''?$langs->trans("Example").' : '.$key['example']:'');
-            print '</tr>';
+            switch ($key['type']) {
+                case "text":
+                case "password":
+                    print '<tr '.$bc[$var].'>';
+                    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']:'';
+                    print '><input type="hidden" name="setupdriver['.$i.'][varname]" value="'.$key['varname'].'"></td>';
+                    print '<td>&nbsp;'.($key['example']!=''?$langs->trans("Example").' : '.$key['example']:'').'</td>';
+                    print '</tr>'."\n";
+                    break;
+                case "authlink":
+                    print '<tr '.$bc[$var].'>';
+                    print '<td>'.$langs->trans($key['varname']).'</td>';
+                    print '<td class="button"><a href="'.$key['link'].'">'.$langs->trans('RequestAccess').'</a></td>';
+                    print '<td>&nbsp;</td>';
+                    print '</tr>'."\n";
+                    break;
+                case "info":
+                    print '<tr '.$bc[$var].'>';
+                    print '<td'.($key['required']?' class=required':'').'>'.$langs->trans($key['varname']).'</td>';
+                    print '<td>'.$langs->trans($key['info']).'</td>';
+                    print '<td>&nbsp;</td>';
+                    print '</tr>'."\n";
+                    break;
+                case "submit":
+                    if ($key['enabled']) $submit_enabled=1;
+                    break;
+            }
             $i++;
         }
     } else {
@@ -156,7 +180,9 @@ if ($mode == 'setup' && $user->admin)
     print '</table>';
     if (! empty($driver))
     {
-        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></center>';
+        if ($submit_enabled) {
+            print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+        }
     }
     print '</form>';
     dol_fiche_end();
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 1ff3859565c..c860ece5616 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2014       Frederic France      <frederic.france@free.fr>
+ * 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
@@ -29,6 +29,7 @@ llxHeader("",$langs->trans("Printing"));
 
 print load_fiche_titre($langs->trans("Printing"));
 
+// TODO use modules to only activated modules
 // List Jobs from printing modules
 $printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
 $printer->list_jobs('commande');

From e90f68906e52fb100a10df23c158b72243eb8e4c Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Fri, 30 Oct 2015 17:59:45 +0100
Subject: [PATCH 053/216] SQL tables for oauth

---
 htdocs/core/modules/modOauth.class.php        | 26 ++++++++++++++++++-
 .../modules/oauth/getgoogleoauthcallback.php  |  2 +-
 .../modules/printing/printgcp.modules.php     |  8 ++----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 9320e45b0b9..c2c164d81a6 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -49,7 +49,7 @@ class modOauth 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));
-		// 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 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "Enable Oauth.";
         $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
@@ -120,4 +120,28 @@ class modOauth extends DolibarrModules
 
 
     }
+
+
+    /**
+     *      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='')
+    {
+        global $conf;
+
+        // Clean before activation
+        $this->remove($options);
+
+        $sql = array(
+            "CREATE TABLE IF NOT EXISTS llx_oauth_state (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), state varchar(128), fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS llx_oauth_token (rowid int(11) NOT NULL AUTO_INCREMENT, service varchar(36), token text, fk_user int(11), fk_adherent int(11), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            );
+
+        return $this->_init($sql,$options);
+    }
 }
diff --git a/htdocs/core/modules/oauth/getgoogleoauthcallback.php b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
index 82d83aa1e44..e514f6abe32 100644
--- a/htdocs/core/modules/oauth/getgoogleoauthcallback.php
+++ b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
@@ -72,7 +72,7 @@ if (! empty($_GET['code'])) {
     // retrieve the CSRF state parameter
     $state = isset($_GET['state']) ? $_GET['state'] : null;
     try {
-        //$token = $storage->retrieveAccessToken('Google');
+        $token = $storage->retrieveAccessToken('Google');
     } catch (Exception $e) {
         print $e->getMessage();
     }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index d7f44ae243f..56f8d8068f9 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -95,8 +95,6 @@ class printing_printgcp extends PrintingDriver
                 $storage->storeAccessToken('Google', $token);
             } catch (Exception $e) {
                 $this->errors[] = $e->getMessage();
-                print '<pre>MissingRefreshToken: '.$e->getMessage().'</pre>';
-                //print '<pre>'.print_r($e,true).'</pre>';
             }
         }
         if (!$conf->oauth->enabled) {
@@ -212,8 +210,6 @@ class printing_printgcp extends PrintingDriver
                 $storage->storeAccessToken('Google', $token);
             } catch (Exception $e) {
                 $this->errors[] = $e->getMessage();
-                print '<pre>MissingRefreshToken: '.$e->getMessage().'</pre>';
-                //print '<pre>'.print_r($e,true).'</pre>';
             }
         }
         // Send a request with api
@@ -248,7 +244,7 @@ class printing_printgcp extends PrintingDriver
     function print_file($file, $module, $subdir='')
     {
         global $conf, $user, $db;
-        // si $module=commande_fournisseur alors $conf->fournisseur->commande->dir_output
+
         $fileprint=$conf->{$module}->dir_output;
         if ($subdir!='') $fileprint.='/'.$subdir;
         $fileprint.='/'.$file;
@@ -314,7 +310,7 @@ class printing_printgcp extends PrintingDriver
                              'content' => base64_encode($contents), // encode file content as base64
                              'contentType' => $contenttype
                             );
-        // Token storage
+        // Dolibarr Token storage
         $storage = new DoliStorage($this->db, $this->conf);
         // Setup the credentials for the requests
         $credentials = new Credentials(

From a8d28b5e4649d700bb2ed94299be8f4351d961c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2015 19:16:02 +0100
Subject: [PATCH 054/216] NEW Add a filter field to restrict list of member
 when doing a LDAP list request. Use also this filter into ldap command line
 script making sync from ldap to dolibarr.

---
 htdocs/admin/ldap.php                         | 10 +++---
 htdocs/admin/ldap_contacts.php                | 16 ++++-----
 htdocs/admin/ldap_groups.php                  | 12 +++----
 htdocs/admin/ldap_members.php                 | 33 ++++++++++++-------
 htdocs/admin/ldap_users.php                   | 30 +++++++++--------
 htdocs/core/class/ldap.class.php              | 28 +++++++++-------
 ...interface_50_modLdap_Ldapsynchro.class.php | 14 ++++----
 .../members/sync_members_ldap2dolibarr.php    |  7 ++--
 scripts/user/sync_users_ldap2dolibarr.php     |  5 +--
 9 files changed, 89 insertions(+), 66 deletions(-)

diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index bfccacc40ac..fadde40dbed 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -92,7 +92,6 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
-dol_fiche_head($head, 'ldap', $langs->trans("LDAPSetup"));
 
 $var=true;
 $form=new Form($db);
@@ -101,6 +100,8 @@ $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"));
+
 print '<table class="noborder" width="100%">';
 
 // Liste de synchro actives
@@ -135,7 +136,7 @@ if (! empty($conf->societe->enabled))
 	print '</td><td>'.$langs->trans("LDAPDnContactActiveExample").'</td></tr>';
 }
 
-// Synchro adherentt active
+// Synchro member active
 if (! empty($conf->adherent->enabled))
 {
 	$var=!$var;
@@ -143,6 +144,7 @@ if (! empty($conf->adherent->enabled))
 	$arraylist=array();
 	$arraylist['0']=$langs->trans("No");
 	$arraylist['1']=$langs->trans("DolibarrToLDAP");
+	$arraylist['ldap2dolibarr']=$langs->trans("LDAPToDolibarr").' ('.$langs->trans("SupportedForLDAPImportScriptOnly").')';
 	print $form->selectarray('activemembers',$arraylist,$conf->global->LDAP_MEMBER_ACTIVE);
 	print '</td><td>'.$langs->trans("LDAPDnMemberActiveExample").'</td></tr>';
 }
@@ -239,12 +241,12 @@ print '</td><td>secret</td></tr>';
 
 print '</table>';
 
+dol_fiche_end();
+
 print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
 
 print '</form>';
 
-print '</div>';
-
 print '<br>';
 
 
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 3af47f46aac..56b755bf64a 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -92,6 +92,8 @@ if ($action == 'setvalue' && $user->admin)
  * View
  */
 
+$form=new Form($db);
+
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 
@@ -114,8 +116,6 @@ print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-$form=new Form($db);
-
 print '<table class="noborder" width="100%">';
 $var=true;
 
@@ -263,16 +263,16 @@ 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>";
 print '</tr>';
 
-
-$var=!$var;
-print '<tr '.$bc[$var].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table>';
 
+print info_admin($langs->trans("LDAPDescValues"));
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
 print '</form>';
 
-print '</div>';
-
-print info_admin($langs->trans("LDAPDescValues"));
 
 /*
  * Test de la connexion
diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index bba8f2109a3..20b94023358 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -177,16 +177,16 @@ 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>";
 print '</tr>';
 
-
-$var=!$var;
-print '<tr '.$bc[$var].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table>';
 
+print info_admin($langs->trans("LDAPDescValues"));
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
 print '</form>';
 
-print '</div>';
-
-print info_admin($langs->trans("LDAPDescValues"));
 
 /*
  * Test de la connexion
diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php
index bd9eda149b4..52117961b54 100644
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.php
@@ -53,6 +53,7 @@ if ($action == 'setvalue' && $user->admin)
 	
 	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++;
 	// Members
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_FULLNAME',GETPOST("fieldfullname"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_LOGIN',GETPOST("fieldlogin"),'chaine',0,'',$conf->entity)) $error++;
@@ -107,6 +108,8 @@ if ($action == 'setvalue' && $user->admin)
  * View
  */
 
+$form=new Form($db);
+
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 
@@ -120,6 +123,9 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
+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"));
 
 
@@ -127,11 +133,6 @@ print $langs->trans("LDAPDescMembers").'<br>';
 print '<br>';
 
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-$form=new Form($db);
-
 print '<table class="noborder" width="100%">';
 $var=true;
 
@@ -156,6 +157,14 @@ print '</td><td>'.$langs->trans("LDAPMemberObjectClassListExample").'</td>';
 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>';
+print '<td></td>';
+print '</tr>';
+
 print '</table>';
 print '<br>';
 print '<table class="noborder" width="100%">';
@@ -377,15 +386,16 @@ print '</td><td>&nbsp;</td>';
 print '<td align="right">&nbsp;</td>';
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table>';
 
+print info_admin($langs->trans("LDAPDescValues"));
+
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
 print '</form>';
 
-print '</div>';
-
-print info_admin($langs->trans("LDAPDescValues"));
 
 
 /*
@@ -454,6 +464,7 @@ if (function_exists("ldap_connect"))
 
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/admin/ldap_users.php b/htdocs/admin/ldap_users.php
index 76d3bb9dfd0..70a94e5817a 100644
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.php
@@ -63,7 +63,7 @@ if ($action == 'setvalue' && $user->admin)
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MAIL',GETPOST("fieldmail"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_PHONE',GETPOST("fieldphone"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_MOBILE',GETPOST("fieldmobile"),'chaine',0,'',$conf->entity)) $error++;
-  if (! dolibarr_set_const($db, 'LDAP_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++;
+    if (! dolibarr_set_const($db, 'LDAP_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_FAX',GETPOST("fieldfax"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_DESCRIPTION',GETPOST("fielddescription"),'chaine',0,'',$conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_FIELD_SID',GETPOST("fieldsid"),'chaine',0,'',$conf->entity)) $error++;
@@ -93,6 +93,8 @@ if ($action == 'setvalue' && $user->admin)
  * Visu
  */
 
+$form=new Form($db);
+
 llxHeader('',$langs->trans("LDAPSetup"),'EN:Module_LDAP_En|FR:Module_LDAP|ES:M&oacute;dulo_LDAP');
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 
@@ -106,18 +108,19 @@ if (! function_exists("ldap_connect"))
 	setEventMessages($langs->trans("LDAPFunctionsNotAvailableOnPHP"), null, 'errors');
 }
 
+
+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"));
 
 print $langs->trans("LDAPDescUsers").'<br>';
 print '<br>';
 
 
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?action=setvalue">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
 
-$form=new Form($db);
-
 print '<table class="noborder" width="100%">';
 $var=true;
 
@@ -141,8 +144,7 @@ print '</td><td>'.$langs->trans("LDAPUserObjectClassListExample").'</td>';
 print '<td>&nbsp;</td>';
 print '</tr>';
 
-// Filtre
-//Utilise pour filtrer la recherche
+// 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.'">';
@@ -281,16 +283,16 @@ 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>";
 print '</tr>';
 
-$var=!$var;
-print '<tr '.$bc[$var].'><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td></tr>';
 print '</table>';
 
-print '</form>';
-
-print '</div>';
-
 print info_admin($langs->trans("LDAPDescValues"));
 
+dol_fiche_end();
+
+print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></div>';
+
+print '</form>';
+
 
 /*
  * Test de la connexion
@@ -392,7 +394,7 @@ if (function_exists("ldap_connect"))
 				$conf->global->LDAP_FIELD_PASSWORD_CRYPTED,
 				$conf->global->LDAP_FIELD_PHONE,
 				$conf->global->LDAP_FIELD_FAX,
-        $conf->global->LDAP_FIELD_SKYPE,
+        		$conf->global->LDAP_FIELD_SKYPE,
 				$conf->global->LDAP_FIELD_MOBILE,
 				$conf->global->LDAP_FIELD_MAIL,
 				$conf->global->LDAP_FIELD_TITLE,
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 400eb934e26..c081ed34a96 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -108,7 +108,7 @@ class Ldap
 	{
 		global $conf;
 
-		//Server
+		// Server
 		if (! empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
 		if (! empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
 		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
@@ -120,9 +120,11 @@ class Ldap
 		$this->searchPassword      = $conf->global->LDAP_ADMIN_PASS;
 		$this->people              = $conf->global->LDAP_USER_DN;
 		$this->groups              = $conf->global->LDAP_GROUP_DN;
-		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION;
 
-		//Users
+		$this->filter              = $conf->global->LDAP_FILTER_CONNECTION;	// Filter on user
+		$this->filtermember        = $conf->global->LDAP_MEMBER_FILTER;		// Filter on member
+		
+		// Users
 		$this->attr_login      = $conf->global->LDAP_FIELD_LOGIN; //unix
 		$this->attr_sambalogin = $conf->global->LDAP_FIELD_LOGIN_SAMBA; //samba, activedirectory
 		$this->attr_name       = $conf->global->LDAP_FIELD_NAME;
@@ -891,14 +893,14 @@ class Ldap
 	}
 
 	/**
-	 * 	Returns an array containing a details of elements
+	 * 	Returns an array containing a details or list of LDAP record(s)
 	 * 	ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
 	 *
-	 *	@param	string	$search			 	Valeur champ cle recherche, sinon '*' pour tous.
+	 *	@param	string	$search			 	Value of fiel to search, '*' for all. Not used if $activefilter is set.
 	 *	@param	string	$userDn			 	DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
 	 *	@param	string	$useridentifier 	Name of key field (Ex: uid)
 	 *	@param	array	$attributeArray 	Array of fields required. Note this array must also contains field $useridentifier (Ex: sn,userPassword)
-	 *	@param	int		$activefilter		1=use field this->filter as filter instead of parameter $search
+	 *	@param	int		$activefilter		'1' or 'user'=use field this->filter as filter instead of parameter $search, 'member'=use field this->filtermember as filter
 	 *	@param	array	$attributeAsArray 	Array of fields wanted as an array not a string
 	 *	@return	array						Array of [id_record][ldap_field]=value
 	 */
@@ -906,7 +908,7 @@ class Ldap
 	{
 		$fulllist=array();
 
-		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")");
+		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).") activefilter=".$activefilter);
 
 		// if the directory is AD, then bind first with the search user first
 		if ($this->serverType == "activedirectory")
@@ -916,15 +918,19 @@ class Ldap
 		}
 
 		// Define filter
-		if ($activefilter == 1)
+		if (! empty($activefilter))
 		{
-			if ($this->filter)
+			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter)
 			{
 				$filter = '('.$this->filter.')';
 			}
-			else
+			elseif (((string) $activefilter == 'member') && $this->filter)
 			{
-				$filter='('.$useridentifier.'=*)';
+				$filter = '('.$this->filtermember.')';
+			}
+			else	// If this->filter is empty, make fiter on * (all)
+			{
+				$filter = '('.$useridentifier.'=*)';
 			}
 		}
 		else
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 7a63a5cdeec..561ba330694 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -414,7 +414,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_CREATE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
         		$ldap=new Ldap();
         		$ldap->connect_bind();
@@ -433,7 +433,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_VALIDATE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
 				// If status field is setup to be synchronized
 				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
@@ -457,7 +457,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_SUBSCRIPTION')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
 				// If subscriptions fields are setup to be synchronized
 				if ($conf->global->LDAP_FIELD_MEMBER_FIRSTSUBSCRIPTION_DATE
@@ -485,7 +485,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
         		$ldap=new Ldap();
         		$ldap->connect_bind();
@@ -522,7 +522,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
 				// If password field is setup to be synchronized
 				if ($conf->global->LDAP_FIELD_PASSWORD || $conf->global->LDAP_FIELD_PASSWORD_CRYPTED)
@@ -546,7 +546,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_RESILIATE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+        	if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
         	{
 				// If status field is setup to be synchronized
 				if (! empty($conf->global->LDAP_FIELD_MEMBER_STATUS))
@@ -570,7 +570,7 @@ class InterfaceLdapsynchro extends DolibarrTriggers
         elseif ($action == 'MEMBER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (! empty($conf->global->LDAP_MEMBER_ACTIVE))
+			if (! empty($conf->global->LDAP_MEMBER_ACTIVE) && (string) $conf->global->LDAP_MEMBER_ACTIVE == '1')
 			{
 				$ldap=new Ldap();
 				$ldap->connect_bind();
diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php
index cf18a75e508..b6a27250557 100755
--- a/scripts/members/sync_members_ldap2dolibarr.php
+++ b/scripts/members/sync_members_ldap2dolibarr.php
@@ -2,7 +2,7 @@
 <?php
 /**
  * Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2006-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2015 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
@@ -115,7 +115,8 @@ print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_MEMBER_DN."\n";
-print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_MEMBER_FILTER)) print 'Filter=('.$conf->global->LDAP_MEMBER_FILTER.')'."\n";	// Note: filter is defined into function getRecords
+else print 'Filter=('.$conf->global->LDAP_KEY_MEMBERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -191,7 +192,7 @@ if ($result >= 0)
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_MEMBER_ACTIVE=0;
 
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 0);
+	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_MEMBER_DN, $conf->global->LDAP_KEY_MEMBERS, $required_fields, 'member');	// Fiter on 'member' filter param
 	if (is_array($ldaprecords))
 	{
 		$db->begin();
diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 53a48cc03ca..48917cc1042 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -106,7 +106,8 @@ print "port=".$conf->global->LDAP_SERVER_PORT."\n";
 print "login=".$conf->global->LDAP_ADMIN_DN."\n";
 print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
 print "DN to extract=".$conf->global->LDAP_USER_DN."\n";
-print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
+if (! empty($conf->global->LDAP_FILTER_CONNECTION)) print 'Filter=('.$conf->global->LDAP_FILTER_CONNECTION.')'."\n";	// Note: filter is defined into function getRecords
+else print 'Filter=('.$conf->global->LDAP_KEY_USERS.'=*)'."\n";
 print "----- To Dolibarr database:\n";
 print "type=".$conf->db->type."\n";
 print "host=".$conf->db->host."\n";
@@ -177,7 +178,7 @@ if ($result >= 0)
 	// We disable synchro Dolibarr-LDAP
 	$conf->global->LDAP_SYNCHRO_ACTIVE=0;
 
-	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 0);
+	$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_USER_DN, $conf->global->LDAP_KEY_USERS, $required_fields, 'user');	// Fiter on 'user' filter param
 	if (is_array($ldaprecords))
 	{
 		$db->begin();

From 6482a4ee04034ab8c4d3028f5bddbff590266c18 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 30 Oct 2015 20:04:03 +0100
Subject: [PATCH 055/216] Minor css fix

---
 htdocs/core/ajax/selectsearchbox.php | 4 ++--
 htdocs/core/lib/project.lib.php      | 2 +-
 htdocs/theme/eldy/style.css.php      | 2 +-
 htdocs/theme/md/style.css.php        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index f4db125ca78..0f00086dbf7 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2015 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
@@ -92,7 +92,7 @@ if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM
 }
 if (! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) && $user->rights->fournisseur->commande->lire)
 {
-	$arrayresult['searchintosupplierorder']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
+	$arrayresult['searchintosupplierorder']=array('text'=>img_picto('','object_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode($search_boxvalue));
 }
 if (! empty($conf->askpricesupplier->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->askpricesupplier->lire)
 {
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 94b2de526dd..004ad3a619f 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -977,7 +977,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks=
 			{
 				$var=!$var;
 				print "<tr ".$bc[$var].">";
-				print '<td class="nowrap">';
+				print '<td>';
 				$projectstatic->ref=$objp->ref;
 				print $projectstatic->getNomUrl(1);
 				print ' - '.dol_trunc($objp->title,24).'</td>';
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ce83c4c41f2..5bb00861ac2 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -641,7 +641,7 @@ div.divphotoref {
 div.statusref {
 	float: right;
 	padding-right: 12px;
-	margin-top: 6px;
+	margin-top: 7px;
 	margin-bottom: 10px;
 }
 img.photoref {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 47da3176126..ab13c8a5f39 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -165,7 +165,7 @@ if ($tmpval <= 360) { $colortextbackvmenu='FFFFFF'; }
 else { $colortextbackvmenu='111111'; }
 $tmppart=explode(',',$colorbacktitle1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
-if ($tmpval <= 360) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
+if ($tmpval <= 260) { $colortexttitle='FFFFFF'; $colorshadowtitle='888888'; }
 else { $colortexttitle='111111'; $colorshadowtitle='FFFFFF'; }
 $tmppart=explode(',',$colorbacktabcard1);
 $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
@@ -687,7 +687,7 @@ div.divphotoref {
 div.statusref {
 	float: right;
 	padding-right: 12px;
-	margin-top: 7px;
+	margin-top: 8px;
 	margin-bottom: 10px;
 }
 img.photoref {

From 975fe064ae812eb68fc63916ef8aac8dd3677dc9 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 30 Oct 2015 21:59:22 +0100
Subject: [PATCH 056/216] [Qual] Uniformize code

---
 htdocs/barcode/codeinit.php         |  6 +++---
 htdocs/barcode/printsheet.php       | 10 +++++-----
 htdocs/bookmarks/admin/bookmark.php |  4 ++--
 htdocs/bookmarks/card.php           |  8 ++++----
 htdocs/bookmarks/list.php           |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 9251b5e7ac9..db662b6d9e4 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -92,7 +92,7 @@ if ($action == 'initbarcodeproducts')
 	if (! is_object($modBarCodeProduct))
 	{
 		$error++;
-		setEventMessage($langs->trans("NoBarcodeNumberingTemplateDefined"),'errors');
+		setEventMessages($langs->trans("NoBarcodeNumberingTemplateDefined"), null, 'errors');
 	}
 
 	if (! $error)
@@ -109,7 +109,7 @@ if ($action == 'initbarcodeproducts')
 			$resql=$db->query($sql);
 			if ($resql)
 			{
-				setEventMessage($langs->trans("AllBarcodeReset"),'mesgs');
+				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
 			}
 			else
 			{
@@ -160,7 +160,7 @@ if ($action == 'initbarcodeproducts')
 
 			if (! $error)
 			{
-				setEventMessage($langs->trans("RecordsModified",$nbok),'mesgs');
+				setEventMessages($langs->trans("RecordsModified",$nbok), null, 'mesgs');
 			}
 		}
 
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index f974bbec897..5cd45467f01 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -68,7 +68,7 @@ if (GETPOST('submitproduct') && GETPOST('submitproduct'))
 
 		if (empty($forbarcode) || empty($fk_barcode_type))
 		{
-			setEventMessage($langs->trans("DefinitionOfBarCodeForProductNotComplete",$producttmp->getNomUrl()), 'warnings');
+			setEventMessages($langs->trans("DefinitionOfBarCodeForProductNotComplete",$producttmp->getNomUrl()), null, 'warnings');
 		}
 	}
 }
@@ -85,7 +85,7 @@ if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
 
 		if (empty($forbarcode) || empty($fk_barcode_type))
 		{
-			setEventMessage($langs->trans("DefinitionOfBarCodeForProductNotComplete",$thirdpartytmp->getNomUrl()), 'warnings');
+			setEventMessages($langs->trans("DefinitionOfBarCodeForProductNotComplete",$thirdpartytmp->getNomUrl()), null, 'warnings');
 		}
 	}
 }
@@ -114,7 +114,7 @@ if ($action == 'builddoc')
 		if ($result <= 0)
 		{
 			$error++;
-			setEventMessage('Failed to get bar code type information '.$stdobject->error, 'errors');
+			setEventMessages('Failed to get bar code type information '.$stdobject->error, $stdobject->errors, 'errors');
 		}
 	}
 
@@ -158,13 +158,13 @@ if ($action == 'builddoc')
 				if ($result <= 0 || ! dol_is_file($barcodeimage))
 				{
 					$error++;
-					setEventMessage('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), 'errors');
+					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
 				}
 			}
 			else
 			{
 				$error++;
-				setEventMessage("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, 'errors');
+				setEventMessages("Error, encoding ".$encoding." is not supported by encoder ".$generator.'. You must choose another barcode type or install a barcode generation engine that support '.$encoding, null, 'errors');
 			}
 		} else {
 			$template = 'tcpdflabel';
diff --git a/htdocs/bookmarks/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
index 05691a227b7..bd249055773 100644
--- a/htdocs/bookmarks/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -42,12 +42,12 @@ if ($action == 'setvalue')
 	if (! $error)
 	{
 		$db->commit();
-		setEventMessage($langs->trans("SetupSaved"));
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	}
 	else
 	{
 		$db->rollback();
-		setEventMessage($langs->trans("Error"), 'errors');
+		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 33a0f383fde..daacc4ca4da 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -78,12 +78,12 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 
 	if (! $title) {
 		$error++;
-		setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("BookmarkTitle")), 'errors');
+		setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("BookmarkTitle")), null, 'errors');
 	}
 
 	if (! $url) {
 		$error++;
-		setEventMessage($langs->transnoentities("ErrorFieldRequired",$langs->trans("UrlOrLink")), 'errors');
+		setEventMessages($langs->transnoentities("ErrorFieldRequired",$langs->trans("UrlOrLink")), null, 'errors');
 	}
 
 	if (! $error)
@@ -104,11 +104,11 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update')
 			if ($bookmark->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
 				$langs->load("errors");
-				setEventMessage($langs->transnoentities("WarningBookmarkAlreadyExists"), 'warnings');
+				setEventMessages($langs->transnoentities("WarningBookmarkAlreadyExists"), null, 'warnings');
 			}
 			else
 			{
-				setEventMessage($bookmark->error, 'errors');
+				setEventMessages($bookmark->error, $bookmark->errors, 'errors');
 			}
 			$action = $invertedaction;
 		}
diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php
index f8b7c21863d..425ae0079b6 100644
--- a/htdocs/bookmarks/list.php
+++ b/htdocs/bookmarks/list.php
@@ -60,7 +60,7 @@ if ($_GET["action"] == 'delete')
     }
     else
     {
-        setEventMessage($bookmark->error, 'errors');
+        setEventMessages($bookmark->error, $bookmark->errors, 'errors');
     }
 }
 

From 8602d41a28dfbe3a4efab348d196f84845a54a9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 09:46:56 +0100
Subject: [PATCH 057/216] Update COPYRIGHT

---
 COPYRIGHT | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 534770f0f75..66c74407fe7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -56,7 +56,7 @@ JsTimezoneDetect       1.0.4         MIT License                 Yes
 Raven.js               1.1.19        MIT License                 Yes             Used for client-side error logging with Sentry logger
 
 For licenses compatibility informations:
-http://www.fsf.org/licensing/licenses/index_html
+http://www.gnu.org/licenses/licenses.en.html
 
 
 Copyright

From 883aff8235b114057f1dac4f03ac87ed0252f851 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 09:52:16 +0100
Subject: [PATCH 058/216] License PHPOauthLib

---
 COPYRIGHT | 1 +
 1 file changed, 1 insertion(+)

diff --git a/COPYRIGHT b/COPYRIGHT
index 534770f0f75..9707cbf60d6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -25,6 +25,7 @@ PEAR Mail_MIME         1.8.9         BSD                         Yes
 odtPHP                 1.0.1         GPL-2+  b                   Yes             Library to build/edit ODT files
 PHPExcel               1.8.0         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
 Raven-php              0.12.1        MIT License                 Yes             Used for server-side error logging with Sentry logger
 Restler                3.0           LGPL-3+                     Yes             Library to develop REST Web services

From 41603426566875652229474f0a1c7002ac543320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 10:05:34 +0100
Subject: [PATCH 059/216] Update llx_c_hrm_function.sql

---
 htdocs/install/mysql/data/llx_c_hrm_function.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_hrm_function.sql b/htdocs/install/mysql/data/llx_c_hrm_function.sql
index f8b56563689..dd5c6e832bd 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_function.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_function.sql
@@ -26,9 +26,9 @@
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1, 5,'EXECBOARD', 'Executive board', 0, 1);
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1);
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 25, 'DIRECTOR', 'Director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 30, 'PROJMANAG', 'Project manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 35, 'DEPHEAD', 'Department head', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 40, 'SECRETAR', 'Secretary', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(9, 45, 'EMPLOYEE', 'Department employee', 0, 1);

From 4108f55c1e728b912af614fab0ac060779a8d671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 10:07:13 +0100
Subject: [PATCH 060/216] Update 3.8.0-3.9.0.sql

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 4f1e308b370..1d6d7974285 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -134,12 +134,12 @@ CREATE TABLE IF NOT EXISTS llx_c_hrm_function
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1,  5, 'EXECBOARD', 'Executive board', 0, 1);
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(2, 10, 'MANAGDIR', 'Managing director', 1, 1);
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 15, 'ACCOUNTMANAG', 'Account manager', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(3, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 25, 'DIRECTOR', 'Director', 1, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 30, 'PROJMANAG', 'Project manager', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 35, 'DEPHEAD', 'Department head', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 40, 'SECRETAR', 'Secretary', 0, 1);
-INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 45, 'EMPLOYEE', 'Department employee', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(4, 20, 'ENGAGDIR', 'Engagement director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(5, 25, 'DIRECTOR', 'Director', 1, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(6, 30, 'PROJMANAG', 'Project manager', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(7, 35, 'DEPHEAD', 'Department head', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(8, 40, 'SECRETAR', 'Secretary', 0, 1);
+INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(9, 45, 'EMPLOYEE', 'Department employee', 0, 1);
 
 CREATE TABLE IF NOT EXISTS llx_c_hrm_department
 (

From f3f83fa6c13099661cf8431611730fcfa123e971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 10:32:41 +0100
Subject: [PATCH 061/216] Remove incomplete llx_stock_lotserial migration

There is two creation of this table in migration script, keeping the more complete
---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 4f1e308b370..d82cae8f1cf 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -106,21 +106,6 @@ ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy;
 ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1;
 
 
-create table llx_stock_lotserial
-(
-  rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  datec           datetime,
-  tms             timestamp,
-  fk_user_creat   integer,
-  fk_user_modif   integer,
-  fk_product      integer NOT NULL,				-- Id of product
-  batch           varchar(30) DEFAULT NULL,		-- Lot or serial number
-  eatby           date DEFAULT NULL,			-- Eatby date
-  sellby          date DEFAULT NULL 			-- Sellby date
-) ENGINE=innodb;
-
-
-
 CREATE TABLE IF NOT EXISTS llx_c_hrm_function
 (
   rowid     integer     PRIMARY KEY,

From d49d3808b939399bd8c534076742d467397daae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:19:01 +0100
Subject: [PATCH 062/216] Update list.php

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 7d86c04869c..dc7266603ca 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -202,7 +202,7 @@ if ($resql)
 	if ($sall)
 	{
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
 	}
 
 	// Filter on categories

From 08dccf341c83cb7a76c7ca8412e6cae0025da1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:24:49 +0100
Subject: [PATCH 063/216] Update list.php

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

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index c623069cd85..8bd5407ef03 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -281,7 +281,7 @@ if ($result)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         //sort($fieldstosearchall);
-        print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
 	
 	$i = 0;

From 8a07efb995e3ffaf5affd81b79186cbc26f0d2c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:25:59 +0100
Subject: [PATCH 064/216] Update list.php

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

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 2a1163111ed..ebe4c9c337d 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -287,7 +287,7 @@ if ($result)
     if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
+        print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
     }
 	if ($search_firstlast_only)
 	{

From 6e2d4aebb19b5faed9cc4fddd95f734cabf4690d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:27:50 +0100
Subject: [PATCH 065/216] Update list.php

---
 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 dc9dcb7ed58..4e84508fbd6 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -333,7 +333,7 @@ else
     	    if ($sall)
             {
                 foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-                print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
+                print $langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall);
             }
             
     		// Filter on categories

From ee94aea1ef759af2a0d549a32258236e3172d51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:28:49 +0100
Subject: [PATCH 066/216] Update list.php

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

diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 17aa5cac222..7481a6bf05c 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -259,7 +259,7 @@ if ($resql)
 	if ($search_all)
 	{
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall));
+        print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
 	}
 
 	$colspan=8;

From 0f6a401eddce5835692ac192e16a565c8af7f28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 11:30:11 +0100
Subject: [PATCH 067/216] Update list.php

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

diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 6c554aa5137..c8c25acdd24 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -445,7 +445,7 @@ if ($resql)
     if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall));
+        print $langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall);
     }
 	
 	// Filter on categories

From 592348850fa4a2cb63099d7189784113388d8762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 31 Oct 2015 11:48:17 +0100
Subject: [PATCH 068/216] Added missing SQL statements + reordered them

---
 .../install/mysql/migration/3.8.0-3.9.0.sql   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 83013214eb3..1b383b80624 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -69,17 +69,8 @@ ALTER TABLE llx_societe_rib MODIFY COLUMN code_banque varchar(128);
 
 ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30);
 ALTER TABLE llx_commande ADD COLUMN fk_warehouse integer DEFAULT NULL after fk_shipping_method;
-CREATE TABLE llx_product_pricerules
-(
-    rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-    level INT NOT NULL, -- Which price level is this rule for?
-    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
-);
 
 ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(750);
-
 ALTER TABLE llx_ecm_directories DROP INDEX idx_ecm_directories;
 ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX uk_ecm_directories (label, fk_parent, entity);
 --ALTER TABLE llx_ecm_directories ADD UNIQUE INDEX uk_ecm_directories_fullpath(fullpath);
@@ -263,4 +254,15 @@ ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (
 ALTER TABLE llx_c_typent ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_c_forme_juridique ADD COLUMN position integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_c_type_fees ADD COLUMN position integer NOT NULL DEFAULT 0;
-ALTER TABLE llx_product ADD COLUMN price_autogen TINYINT(1) DEFAULT 0;
\ No newline at end of file
+
+-- NEW Level multiprice generator based on per cent variations over base price
+CREATE TABLE llx_product_pricerules
+(
+    rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+    level INT NOT NULL, -- Which price level is this rule for?
+    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
+);
+ALTER TABLE llx_product ADD COLUMN price_autogen TINYINT(1) DEFAULT 0;
+ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
\ No newline at end of file

From ff5fcbbc10f4c877c627c3b408a0137820c4bfd0 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 31 Oct 2015 17:21:48 +0100
Subject: [PATCH 069/216] [Qual] Uniformize code

---
 htdocs/cashdesk/admin/cashdesk.php    |  4 ++--
 htdocs/categories/card.php            |  2 +-
 htdocs/categories/categorie.php       |  9 ++++----
 htdocs/comm/action/card.php           |  9 ++++----
 htdocs/comm/askpricesupplier/card.php | 32 ++++++++++++++-------------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 74560e8ff6a..fcafa84a5a2 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -66,12 +66,12 @@ if (GETPOST('action','alpha') == 'set')
  	if (! $error)
     {
         $db->commit();
-	    setEventMessage($langs->trans("SetupSaved"));
+	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
     else
     {
         $db->rollback();
-	    setEventMessage($langs->trans("Error"), 'errors');
+	    setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index f5921ac4d06..6281307218c 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -155,7 +155,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 		}
 		else
 		{
-			setEventMessage($object->error,'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index aca45c5ca52..d86a351cdff 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -151,8 +151,7 @@ if (empty($reshook))
 		$result=$cat->del_type($object,$elementtype);
 		if ($result < 0)
 		{
-			setEventMessage($cat->error,'errors');
-			setEventMessage($cat->errors,'errors');
+			setEventMessages($cat->error, $cat->errors, 'errors');
 		}
 	}
 
@@ -199,17 +198,17 @@ if (empty($reshook))
 		$result=$cat->add_type($object,$elementtype);
 		if ($result >= 0)
 		{
-			setEventMessage($langs->trans("WasAddedSuccessfully",$cat->label));
+			setEventMessages($langs->trans("WasAddedSuccessfully",$cat->label), null, 'mesgs');
 		}
 		else
 		{
 			if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 			{
-				setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings');
+				setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
 			}
 			else
 			{
-				setEventMessages( $cat->error, $cat->errors, 'errors' );
+				setEventMessages($cat->error, $cat->errors, 'errors');
 			}
 		}
 	}
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1f2f0c3b19e..2fe0df507cb 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -140,7 +140,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes')
 {
 	if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 	{
-		setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
 	else
 	{
@@ -151,7 +151,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes')
 				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
 				exit();
 			} else {
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			}
 		}
@@ -347,7 +347,7 @@ if ($action == 'add')
 				$db->rollback();
 				$langs->load("errors");
 				$error=$langs->trans($object->error);
-				setEventMessage($error,'errors');
+				setEventMessages($error, null, 'errors');
 				$action = 'create'; $donotclearsession=1;
 			}
 		}
@@ -551,8 +551,7 @@ if ($action == 'mupdate')
         $result=$object->update($user);
         if ($result < 0)
         {
-            setEventMessage($object->error,'errors');
-            setEventMessage($object->errors,'errors');
+            setEventMessages($object->error, $object->errors, 'errors');
         }
     }
     if (! empty($backtopage))
diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index f57cb16e0e0..d59922c1cb4 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -114,7 +114,7 @@ if (empty($reshook))
 	{
 		if (1 == 0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 		{
-			setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
 		else
 		{
@@ -123,8 +123,10 @@ if (empty($reshook))
 				if ($result > 0) {
 					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
 					exit();
-				} else {
-					setEventMessage($object->error, 'errors');
+				} 
+				else 
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
 			}
@@ -140,7 +142,7 @@ if (empty($reshook))
 			exit();
 		} else {
 			$langs->load("errors");
-			setEventMessage($langs->trans($object->error), 'errors');
+			setEventMessages($langs->trans($object->error), null, 'errors');
 		}
 	}
 
@@ -198,8 +200,8 @@ if (empty($reshook))
 			}
 		} else {
 			$langs->load("errors");
-			if (count($object->errors) > 0) setEventMessage($object->errors, 'errors');
-			else setEventMessage($langs->trans($object->error), 'errors');
+			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
 	}
 
@@ -249,7 +251,7 @@ if (empty($reshook))
 
 					$id = $object->create_from($user);
 				} else {
-					setEventMessage($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_askpricesupplier')), 'errors');
+					setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_askpricesupplier')), null, 'errors');
 				}
 			} else {
 				$object->ref = GETPOST('ref');
@@ -484,7 +486,7 @@ if (empty($reshook))
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
 				if ($result < 0) {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -674,7 +676,7 @@ if (empty($reshook))
 
 			if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-				setEventMessage($mesg, 'errors');
+				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Insert line
 				$ref_fourn = GETPOST('fourn_ref');
@@ -716,7 +718,7 @@ if (empty($reshook))
 				} else {
 					$db->rollback();
 
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -774,7 +776,7 @@ if (empty($reshook))
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
-				setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors');
+				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error ++;
 			}
 		} else {
@@ -823,7 +825,7 @@ if (empty($reshook))
 			} else {
 				$db->rollback();
 
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
@@ -865,9 +867,9 @@ if (empty($reshook))
 			$file = $upload_dir . '/' . GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret)
-				setEventMessage($langs->trans("FileWasRemoved", GETPOST('file')));
+				setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
 			else
-				setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), 'errors');
+				setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
 		}
 	}
 
@@ -1325,7 +1327,7 @@ if ($action == 'create')
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error ++;
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		} else {
 			$numref = $object->ref;

From 0836a84c0ed10f265e578d08bb87892a57e3bd67 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 18:06:49 +0100
Subject: [PATCH 070/216] Somme cleaning

---
 htdocs/admin/oauth.php               |  4 ++--
 htdocs/core/actions_printing.inc.php | 10 +++++-----
 htdocs/printing/admin/printing.php   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 517b4eeb8e9..6283d78d95e 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -270,9 +270,9 @@ if ($action == 'update')
 
     if (! $error)
     {
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null);
     } else {
-        setEventMessage($langs->trans("Error"),'errors');
+        setEventMessages($langs->trans("Error"), null, 'errors');
     }
 }
 
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index e447722fc67..eeecc25fbd2 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -48,18 +48,18 @@ if ($action == 'print_file' and $user->rights->printing->read)
                 $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
                 $ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
                 if ($ret < 0) {
-                    setEventMessage($printer->error, 'errors');
+                    setEventMessages($printer->error, $printer->errors, 'errors');
                 }
                 if ($ret==0) {
-                    setEventMessage($printer->error, 'warning');
-                    setEventMessage($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name);
+                    setEventMessages($printer->error, $printer->errors, 'warning');
+                    setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name, null);
                     $printed++;
                 }
             }
         }
-        if ($printed==0) setEventMessage($langs->trans("NoActivePrintingModuleFound"));
+        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null);
     } else {
-        setEventMessage($langs->trans("NoModuleFound"), 'warning');
+        setEventMessages($langs->trans("NoModuleFound"), null, 'warning');
     }
     $action = '';
 }
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index a779582d108..da7de1bbdfb 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -50,7 +50,7 @@ if (!$mode) $mode='config';
 
 if (($mode == 'test' || $mode == 'setup') && empty($driver))
 {
-    setEventMessage($langs->trans('PleaseSelectaDriverfromList'));
+    setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null);
     header("Location: ".$_SERVER['PHP_SELF'].'?mode=config');
     exit;
 }
@@ -68,7 +68,7 @@ if ($action == 'setconst' && $user->admin)
     if (! $error)
     {
         $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null);
     }
     else
     {
@@ -88,7 +88,7 @@ if ($action == 'setvalue' && $user->admin)
     if (! $error)
     {
         $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
+        setEventMessages($langs->trans("SetupSaved"), null);
     }
     else
     {

From df3af6979e484a57cfa894974a4aabfb2172f72f Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 21:43:59 +0100
Subject: [PATCH 071/216] Translation in paypal lib

---
 htdocs/langs/en_US/paypal.lang   |  5 +++++
 htdocs/paypal/lib/paypal.lib.php | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index b6b6d59d4a0..def6a08406f 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -23,3 +23,8 @@ 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
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DetailedErrorMessage=Detailed Error Message
+ShortErrorMessage=Short Error Message
+ErrorCode=Error Code
+ErrorSeverityCode=Error Severity Code
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index f9ec79244a5..824f312a9af 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -406,11 +406,11 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re
         $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
         $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
-        echo "SetExpressCheckout API call failed. <br>\n";
-        echo "Detailed Error Message: " . $ErrorLongMsg." <br>\n";
-        echo "Short Error Message: " . $ErrorShortMsg." <br>\n";
-        echo "Error Code: " . $ErrorCode." <br>\n";
-        echo "Error Severity Code: " . $ErrorSeverityCode." <br>\n";
+        echo $langs->trans('SetExpressCheckoutAPICallFailed') . "<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";
     }
 
 }

From 22d1cf860c70a375f4c83684d5d24e514cb30de3 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 22:05:55 +0100
Subject: [PATCH 072/216] Add translation

---
 htdocs/langs/en_US/paypal.lang     |  1 +
 htdocs/public/paypal/paymentok.php | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index def6a08406f..b2eadfce654 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -24,6 +24,7 @@ ReturnURLAfterPayment=Return URL after payment
 ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed 
 PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
 DetailedErrorMessage=Detailed Error Message
 ShortErrorMessage=Short Error Message
 ErrorCode=Error Code
diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php
index f59bab46bd1..90f13aa6f17 100644
--- a/htdocs/public/paypal/paymentok.php
+++ b/htdocs/public/paypal/paymentok.php
@@ -224,11 +224,11 @@ if ($PAYPALTOKEN)
             $ErrorLongMsg = urldecode($resArray["L_LONGMESSAGE0"]);
             $ErrorSeverityCode = urldecode($resArray["L_SEVERITYCODE0"]);
 
-            echo "DoExpressCheckoutPayment API call failed.<br>\n";
-            echo "Detailed Error Message: " . $ErrorLongMsg."<br>\n";
-            echo "Short Error Message: " . $ErrorShortMsg."<br>\n";
-            echo "Error Code: " . $ErrorCode."<br>\n";
-            echo "Error Severity Code: " . $ErrorSeverityCode."<br>\n";
+            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";
 

From bb06a55844188cc29c7edbdee1dc25f99f921bd0 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 31 Oct 2015 23:05:15 +0100
Subject: [PATCH 073/216] Work on list jobs

---
 .../modules/printing/printgcp.modules.php     | 83 +++++++++++++++++++
 htdocs/langs/en_US/printing.lang              |  4 +
 htdocs/printing/index.php                     | 17 +++-
 3 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 56f8d8068f9..e7d34f3666c 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -46,6 +46,7 @@ class printing_printgcp extends PrintingDriver
 
     const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
     const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
+    const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
     const PRINT_URL = 'https://www.google.com/cloudprint/submit';
 
     /**
@@ -347,4 +348,86 @@ class printing_printgcp extends PrintingDriver
         return array('status' =>$response['success'],'errorcode' =>$response['errorCode'],'errormessage'=>$response['message']);
     }
 
+
+    /**
+     *  List jobs print
+     *
+     *  @return void
+     */
+    function list_jobs()
+    {
+        global $conf, $db, $bc;
+        // Token storage
+        $storage = new DoliStorage($this->db, $this->conf);
+        // Setup the credentials for the requests
+        $credentials = new Credentials(
+            $this->google_id,
+            $this->google_secret,
+            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+        );
+        $serviceFactory = new \OAuth\ServiceFactory();
+        $apiService = $serviceFactory->createService('Google', $credentials, $storage, array());
+        // Check if we have auth token
+        $token_ok=true;
+        try {
+            $token = $storage->retrieveAccessToken('Google');
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $token_ok = false;
+        }
+        $expire = false;
+        // Is token expired or will token expire in the next 30 seconds
+        if ($token_ok) {
+            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+        }
+
+        // Token expired so we refresh it
+        if ($token_ok && $expire) {
+            try {
+                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+                $refreshtoken = $token->getRefreshToken();
+                $token = $apiService->refreshAccessToken($token);
+                $token->setRefreshToken($refreshtoken);
+                $storage->storeAccessToken('Google', $token);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+            }
+        }
+        // Getting Jobs
+        // Send a request with api
+        try {
+            $response = $apiService->request(self::PRINTERS_GET_JOBS);
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            print '<pre>'.print_r($e->getMessage(),true).'</pre>';
+        }
+        $responsedata = json_decode($response, true);
+        //print '<pre>'.print_r($responsedata,true).'</pre>';
+        print '<table width="100%" class="noborder">';
+        print '<tr class="liste_titre">';
+        print "<td>Id</td>";
+        print "<td>Owner</td>";
+        print "<td>Printer</td>";
+        print "<td>File</td>";
+        print "<td>Status</td>";
+        print "<td>Cancel</td>";
+        print "</tr>\n";
+        $var = True;
+        $jobs = $responsedata['jobs'];
+        //print '<pre>'.print_r($jobs['0'],true).'</pre>';
+        foreach ($jobs as $value )
+        {
+            $var=!$var;
+            print "<tr ".$bc[$var].">";
+            print '<td>'.$value['id'].'</td>';
+            print '<td>'.$value['ownerId'].'</td>';
+            print '<td>'.$value['printerName'].'</td>';
+            print '<td>'.$value['title'].'</td>';
+            print '<td>'.$value['status'].'</td>';
+            print '<td>&nbsp;</td>';
+            print '</tr>';
+        }
+        print "</table>";
+    }
+
 }
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index c41a1a9a20a..81ee8071b2e 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -20,6 +20,10 @@ UserConf=Setup per user
 PRINTGCP=Google Cloud Print
 PRINTGCP_INFO=Google Api State
 PRINTGCP_AUTHLINK=Authentication
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print Token
+PRINTGCP_TOKEN_REFRESH=Token Refresh Present
+PRINTGCP_TOKEN_EXPIRED=Token Expired
+PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
 RequestAccess=Request Access
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index c860ece5616..2bee135ca44 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -23,16 +23,25 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/dolprintipp.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 
 llxHeader("",$langs->trans("Printing"));
 
 print load_fiche_titre($langs->trans("Printing"));
 
-// TODO use modules to only activated modules
 // List Jobs from printing modules
-$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD);
-$printer->list_jobs('commande');
+$object = new PrintingDriver($db);
+$result = $object->listDrivers($db, 10);
+foreach ($result as $driver) {
+    require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+    $classname = 'printing_'.$driver;
+    $langs->load($driver);
+    $printer = new $classname($db);
+    if ($conf->global->{$printer->active}) {
+        //$printer->list_jobs('commande');
+        $printer->list_jobs();
+    }
+}
 
 llxFooter();
 

From 2f3e6958f905a669deaa731577f449a5aa5678d8 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sun, 1 Nov 2015 00:58:08 +0100
Subject: [PATCH 074/216] Receipt Printer

---
 COPYRIGHT                                     |    1 +
 htdocs/core/class/dolreceiptprinter.class.php |  111 +
 .../core/modules/modReceiptPrinter.class.php  |  123 +
 htdocs/includes/escpos/.gitignore             |   12 +
 htdocs/includes/escpos/Escpos.php             |  851 ++++++
 htdocs/includes/escpos/LICENSE.md             |   27 +
 htdocs/includes/escpos/README.md              |  352 +++
 htdocs/includes/escpos/composer.json          |   36 +
 htdocs/includes/escpos/composer.lock          |  975 +++++++
 htdocs/includes/escpos/doc/Makefile           |    9 +
 htdocs/includes/escpos/doc/escpos.conf        | 2352 +++++++++++++++++
 htdocs/includes/escpos/example/README.md      |   26 +
 htdocs/includes/escpos/example/barcode.php    |  181 ++
 htdocs/includes/escpos/example/bit-image.php  |   32 +
 .../character-encodings-with-images.php       |   59 +
 .../escpos/example/character-encodings.php    |   58 +
 .../escpos/example/character-tables.php       |   71 +
 htdocs/includes/escpos/example/demo.php       |  167 ++
 htdocs/includes/escpos/example/graphics.php   |   32 +
 .../escpos/example/interface/README.md        |    8 +
 .../escpos/example/interface/ethernet.php     |   22 +
 .../escpos/example/interface/linux-usb.php    |   33 +
 .../includes/escpos/example/interface/smb.php |   51 +
 .../escpos/example/interface/windows-lpt.php  |   30 +
 .../escpos/example/interface/windows-usb.php  |   32 +
 .../escpos/example/print-from-html.php        |   53 +
 .../escpos/example/print-from-pdf.php         |   71 +
 htdocs/includes/escpos/example/qr-code.php    |   81 +
 .../escpos/example/receipt-with-logo.php      |   96 +
 .../character-encoding-test-strings.inc       |   35 +
 .../escpos/example/resources/document.odt     |  Bin 0 -> 39751 bytes
 .../escpos/example/resources/document.pdf     |  Bin 0 -> 24389 bytes
 .../escpos/example/resources/document.z       |  Bin 0 -> 20320 bytes
 .../example/resources/escpos-php-small.png    |  Bin 0 -> 1941 bytes
 .../escpos/example/resources/escpos-php.png   |  Bin 0 -> 7871 bytes
 .../includes/escpos/example/resources/tux.png |  Bin 0 -> 5198 bytes
 .../specific/29-latvian-star-tup592.php       |   21 +
 .../32-german-tm-t20-ii-custom-command.php    |   36 +
 .../specific/33-spanish-seypos-prp-300.php    |   16 +
 .../example/specific/39-currency-symbols.php  |   69 +
 .../specific/44-pound-symbol-star-tsp650.php  |   31 +
 .../example/specific/50-P-822D-greek.php      |   16 +
 .../specific/6-arabic-epos-tep-220m.php       |   47 +
 .../escpos/example/specific/README.md         |    7 +
 htdocs/includes/escpos/example/text-size.php  |   62 +
 .../escpos/src/AbstractCapabilityProfile.php  |   61 +
 htdocs/includes/escpos/src/CodePage.php       |  181 ++
 .../escpos/src/DefaultCapabilityProfile.php   |  103 +
 .../escpos/src/DummyPrintConnector.php        |   78 +
 .../escpos/src/EposTepCapabilityProfile.php   |    4 +
 htdocs/includes/escpos/src/EscposImage.php    |  405 +++
 .../includes/escpos/src/EscposPrintBuffer.php |  304 +++
 .../escpos/src/FilePrintConnector.php         |   80 +
 .../includes/escpos/src/ImagePrintBuffer.php  |   99 +
 .../escpos/src/NetworkPrintConnector.php      |   39 +
 .../escpos/src/P822DCapabilityProfile.php     |   90 +
 htdocs/includes/escpos/src/PrintBuffer.php    |   75 +
 htdocs/includes/escpos/src/PrintConnector.php |   56 +
 .../escpos/src/SimpleCapabilityProfile.php    |   17 +
 .../escpos/src/StarCapabilityProfile.php      |   82 +
 .../escpos/src/WindowsPrintConnector.php      |  356 +++
 ...Characters-DefaultCapabilityProfile.ser.gz |  Bin 0 -> 12928 bytes
 .../Characters-SimpleCapabilityProfile.ser.gz |  Bin 0 -> 1116 bytes
 .../Characters-StarCapabilityProfile.ser.gz   |  Bin 0 -> 9416 bytes
 htdocs/includes/escpos/test/bootstrap.php     |   27 +
 .../escpos/test/integration/ExampleTest.php   |  126 +
 .../integration/resources/output/barcode.bin  |  Bin 0 -> 2342 bytes
 .../resources/output/bit-image.bin            |  Bin 0 -> 9789 bytes
 .../resources/output/character-encodings.bin  |  Bin 0 -> 1780 bytes
 .../resources/output/character-tables.bin     |  Bin 0 -> 8174 bytes
 .../integration/resources/output/demo.bin     |  Bin 0 -> 73643 bytes
 .../integration/resources/output/graphics.bin |  Bin 0 -> 9635 bytes
 .../resources/output/interface.bin            |    2 +
 .../resources/output/print-from-pdf.bin.z     |  Bin 0 -> 17081 bytes
 .../integration/resources/output/qr-code.bin  |  Bin 0 -> 1551 bytes
 .../resources/output/receipt-with-logo.bin    |  Bin 0 -> 9579 bytes
 .../resources/output/text-size.bin            |  Bin 0 -> 368 bytes
 htdocs/includes/escpos/test/phpunit.xml       |   16 +
 .../unit/AbstractCapabilityProfileTest.php    |   69 +
 .../escpos/test/unit/EscposImageTest.php      |  235 ++
 .../test/unit/EscposPrintBufferTest.php       |  150 ++
 .../includes/escpos/test/unit/EscposTest.php  |  765 ++++++
 .../test/unit/WindowsPrintConnectorTest.php   |  252 ++
 .../test/unit/resources/black_transparent.gif |  Bin 0 -> 65 bytes
 .../test/unit/resources/black_transparent.png |  Bin 0 -> 167 bytes
 .../test/unit/resources/black_white.bmp       |  Bin 0 -> 138 bytes
 .../test/unit/resources/black_white.gif       |  Bin 0 -> 65 bytes
 .../test/unit/resources/black_white.jpg       |  Bin 0 -> 175 bytes
 .../test/unit/resources/black_white.png       |  Bin 0 -> 156 bytes
 .../test/unit/resources/canvas_black.bmp      |  Bin 0 -> 142 bytes
 .../test/unit/resources/canvas_black.gif      |  Bin 0 -> 72 bytes
 .../test/unit/resources/canvas_black.jpg      |  Bin 0 -> 160 bytes
 .../test/unit/resources/canvas_black.png      |  Bin 0 -> 239 bytes
 .../test/unit/resources/canvas_white.bmp      |  Bin 0 -> 142 bytes
 .../test/unit/resources/canvas_white.gif      |  Bin 0 -> 72 bytes
 .../test/unit/resources/canvas_white.jpg      |  Bin 0 -> 160 bytes
 .../test/unit/resources/canvas_white.png      |  Bin 0 -> 239 bytes
 .../escpos/test/unit/resources/demo.php       |   19 +
 .../escpos/test/unit/resources/doc.pdf        |  Bin 0 -> 6681 bytes
 99 files changed, 9983 insertions(+)
 create mode 100644 htdocs/core/class/dolreceiptprinter.class.php
 create mode 100644 htdocs/core/modules/modReceiptPrinter.class.php
 create mode 100644 htdocs/includes/escpos/.gitignore
 create mode 100644 htdocs/includes/escpos/Escpos.php
 create mode 100644 htdocs/includes/escpos/LICENSE.md
 create mode 100644 htdocs/includes/escpos/README.md
 create mode 100644 htdocs/includes/escpos/composer.json
 create mode 100644 htdocs/includes/escpos/composer.lock
 create mode 100644 htdocs/includes/escpos/doc/Makefile
 create mode 100644 htdocs/includes/escpos/doc/escpos.conf
 create mode 100644 htdocs/includes/escpos/example/README.md
 create mode 100644 htdocs/includes/escpos/example/barcode.php
 create mode 100644 htdocs/includes/escpos/example/bit-image.php
 create mode 100644 htdocs/includes/escpos/example/character-encodings-with-images.php
 create mode 100644 htdocs/includes/escpos/example/character-encodings.php
 create mode 100644 htdocs/includes/escpos/example/character-tables.php
 create mode 100644 htdocs/includes/escpos/example/demo.php
 create mode 100644 htdocs/includes/escpos/example/graphics.php
 create mode 100644 htdocs/includes/escpos/example/interface/README.md
 create mode 100644 htdocs/includes/escpos/example/interface/ethernet.php
 create mode 100644 htdocs/includes/escpos/example/interface/linux-usb.php
 create mode 100644 htdocs/includes/escpos/example/interface/smb.php
 create mode 100644 htdocs/includes/escpos/example/interface/windows-lpt.php
 create mode 100644 htdocs/includes/escpos/example/interface/windows-usb.php
 create mode 100644 htdocs/includes/escpos/example/print-from-html.php
 create mode 100644 htdocs/includes/escpos/example/print-from-pdf.php
 create mode 100644 htdocs/includes/escpos/example/qr-code.php
 create mode 100644 htdocs/includes/escpos/example/receipt-with-logo.php
 create mode 100644 htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
 create mode 100644 htdocs/includes/escpos/example/resources/document.odt
 create mode 100644 htdocs/includes/escpos/example/resources/document.pdf
 create mode 100644 htdocs/includes/escpos/example/resources/document.z
 create mode 100644 htdocs/includes/escpos/example/resources/escpos-php-small.png
 create mode 100644 htdocs/includes/escpos/example/resources/escpos-php.png
 create mode 100644 htdocs/includes/escpos/example/resources/tux.png
 create mode 100644 htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
 create mode 100644 htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
 create mode 100644 htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
 create mode 100644 htdocs/includes/escpos/example/specific/39-currency-symbols.php
 create mode 100644 htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
 create mode 100644 htdocs/includes/escpos/example/specific/50-P-822D-greek.php
 create mode 100644 htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
 create mode 100644 htdocs/includes/escpos/example/specific/README.md
 create mode 100644 htdocs/includes/escpos/example/text-size.php
 create mode 100644 htdocs/includes/escpos/src/AbstractCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/CodePage.php
 create mode 100644 htdocs/includes/escpos/src/DefaultCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/DummyPrintConnector.php
 create mode 100644 htdocs/includes/escpos/src/EposTepCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/EscposImage.php
 create mode 100644 htdocs/includes/escpos/src/EscposPrintBuffer.php
 create mode 100644 htdocs/includes/escpos/src/FilePrintConnector.php
 create mode 100644 htdocs/includes/escpos/src/ImagePrintBuffer.php
 create mode 100644 htdocs/includes/escpos/src/NetworkPrintConnector.php
 create mode 100644 htdocs/includes/escpos/src/P822DCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/PrintBuffer.php
 create mode 100644 htdocs/includes/escpos/src/PrintConnector.php
 create mode 100644 htdocs/includes/escpos/src/SimpleCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/StarCapabilityProfile.php
 create mode 100644 htdocs/includes/escpos/src/WindowsPrintConnector.php
 create mode 100644 htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz
 create mode 100644 htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz
 create mode 100644 htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz
 create mode 100644 htdocs/includes/escpos/test/bootstrap.php
 create mode 100644 htdocs/includes/escpos/test/integration/ExampleTest.php
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/barcode.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/bit-image.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/character-tables.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/demo.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/graphics.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/interface.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/qr-code.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin
 create mode 100644 htdocs/includes/escpos/test/integration/resources/output/text-size.bin
 create mode 100644 htdocs/includes/escpos/test/phpunit.xml
 create mode 100644 htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
 create mode 100644 htdocs/includes/escpos/test/unit/EscposImageTest.php
 create mode 100644 htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
 create mode 100644 htdocs/includes/escpos/test/unit/EscposTest.php
 create mode 100644 htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_transparent.gif
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_transparent.png
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.bmp
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.gif
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.jpg
 create mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.png
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.bmp
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.gif
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.jpg
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.png
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.bmp
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.gif
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.jpg
 create mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.png
 create mode 100644 htdocs/includes/escpos/test/unit/resources/demo.php
 create mode 100644 htdocs/includes/escpos/test/unit/resources/doc.pdf

diff --git a/COPYRIGHT b/COPYRIGHT
index 534770f0f75..32f31baa617 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,6 +16,7 @@ AdoDb-Date             0.33          Modified BSD License        Yes
 ChromePHP              4.1.0         Apache Software License 2.0 Yes             Return server log to chrome browser console
 CKEditor               4.3.3         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
 FirePHPCore            0.4.0         MIT License                 Yes             Send logs to Firefox Firebug console
 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)
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
new file mode 100644
index 00000000000..683efdd1dde
--- /dev/null
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *  \file           htdocs/core/class/dolreceiptprinter.class.php
+ *  \brief          Print receipt ticket on various printer
+ */
+
+/*
+ * codes for ticket template
+ *
+ * <align_left>                                    Left align text
+ * <align_center>                                  Center text
+ * <align_right>                                   Right align text
+ * <use_font_a>                                    Use font A of printer
+ * <use_font_b>                                    Use font B of printer
+ * <use_font_c>                                    Use font C of printer
+ * <bold> </bold>                                  Text Bold
+ * <double_height> </double_height>                Text double height
+ * <double_width> </double_width>                  Text double width
+ * <underline> </underline>                        Underline text
+ * <underline_2dots> </underline>                  Underline with double line
+ * <emphasized> </emphasized>                      Emphasized text
+ * <switch_colors> </switch_colors>                Print in white on black
+ * <print_barcode>                                 Print barcode
+ * <print_barcode_customer_id>                     Print barcode customer id
+ * <set_print_width_57>                            Ticket print width of 57mm
+ * <cut_paper_full>                                Cut ticket completely
+ * <cut_paper_partial>                             Cut ticket partially
+ * <open_drawer>                                   Open cash drawer
+ * <activate_buzzer>                               Activate buzzer
+ * 
+ * Code which can be placed everywhere
+ * <print_qrcode>                                  Print QR Code
+ * <print_date>                                    Print date (format : AAAA-MM-DD)
+ * <print_date_time>                               Print date and time (format AAAA-MM-DD HH:MM:SS)
+ * <print_year>                                    Print Year
+ * <print_month_letters>                           Print month in letters (example : november)
+ * <print_month>                                   Print month number
+ * <print_day>                                     Print day number
+ * <print_table>                                   Print table number
+ * <print_cutlery>                                 Print cutlery number
+ * <print_payment>                                 Print payment method
+ * <print_logo>                                    Print logo stored on printer. Example : <print_logo>32|32
+ * <print_logo_deprecated>                         Print logo stored on printer. Must be followed by logo code. For old printers.
+ * <print_num_order>                               Print order number
+ * <print_num_order_unique>                        Print order number after validation
+ * <print_customer_first_name>                     Print customer firstname
+ * <print_customer_last_name>                      Print customer name
+ * <print_customer_mail>                           Print customer mail
+ * <print_customer_telephone>                      Print customer phone
+ * <print_customer_mobile>                         Print customer mobile
+ * <print_customer_skype>                          Print customer skype
+ * <print_customer_tax_number>                     Print customer VAT number
+ * <print_customer_account_balance>                Print customer account balance
+ * <print_vendor_last_name>                        Print vendor name
+ * <print_vendor_first_name>                       Print vendor firstname
+ * <print_customer_points>                         Print customer points
+ * <print_order_points>                            Print number of points for this order
+ *
+ * Conditional code at line start (if�then Print)
+ * <print_if_customer>                             Print the line IF a customer is affected to the order
+ * <print_if_vendor>                               Print the line IF a vendor is affected to the order
+ * <print_if_happy_hour>                           Print the line IF Happy Hour
+ * <print_if_num_order_unique>                     Print the line IF order is validated
+ * <print_if_customer_points>                      Print the line IF customer points > 0
+ * <print_if_order_points>                         Print the line IF points of the order > 0
+ * <print_if_customer_tax_number>                  Print the line IF customer has vat number
+ * <print_if_customer_account_balance_positive>    Print the line IF customer balance > 0
+ *
+ */
+
+/**
+ * Class to manage Receipt Printers
+ */
+class dolReceiptPrinter
+{
+    var $db;
+    var $error;
+    var $errors;
+
+
+
+    /**
+     * Constructor
+     *
+     * @param   DoliDB      $db         database
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
+
+
+}
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
new file mode 100644
index 00000000000..033303fdcd9
--- /dev/null
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -0,0 +1,123 @@
+<?php
+/* Copyright (C) 2014-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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/>.
+ */
+
+/** \defgroup   printing     Module Receipt Printer
+ *  \brief      Module for activation of printing icon to make receipt ticket
+ */
+
+/**
+ *  \file       htdocs/core/modules/modReceiptPrinter.class.php
+ *  \ingroup    printing
+ *  \brief      File of class to describe and activate module Receipt Printer
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+
+/**
+ *  Class to describe and activate module Receipt Printer
+ */
+class modReceiptPrinter extends DolibarrModules
+{
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB      $db      Database handler
+     */
+    function  __construct($db)
+    {
+        $this->db = $db ;
+        $this->numero = 67000;
+        // 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));
+		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
+        $this->description = "Receipt Printer.";
+        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $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.
+        // 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 = 'printer';
+
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
+
+        // Config pages
+        $this->config_page_url = array("receiptprinter.php");
+
+        // Dependencies
+        $this->depends = array();
+        $this->requiredby = array();
+        $this->phpmin = array(5,1);                     // Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->conflictwith = array();
+        $this->langfiles = array("receiptprinter");
+
+        // Constants
+        $this->const = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'receiptprinter';
+
+        $r=0;
+        // $this->rights[$r][0]     Id permission (unique tous modules confondus)
+        // $this->rights[$r][1]     Libelle par defaut si traduction de cle "PermissionXXX" non trouvee (XXX = Id permission)
+        // $this->rights[$r][2]     Non utilise
+        // $this->rights[$r][3]     1=Permis par defaut, 0=Non permis par defaut
+        // $this->rights[$r][4]     Niveau 1 pour nommer permission dans code
+        // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
+
+        $r++;
+        $this->rights[$r][0] = 67001;
+        $this->rights[$r][1] = 'ReceiptPrinter';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 1;
+        $this->rights[$r][4] = 'read';
+
+        // Main menu entries
+        $this->menus = array();         // List of menus to add
+        $r=0;
+
+        // This is to declare the Top Menu entry:
+        //$this->menu[$r]=array(  'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools',               // Put 0 if this is a top menu
+        //                        'type'=>'left',                 // This is a Top menu entry
+        //                        'titre'=>'MenuDirectPrinting',
+        //                        'mainmenu'=>'printing',
+        //                        'url'=>'/printing/index.php',
+        //                        '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==\'modulesadmintools\'',
+        //                        '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
+
+        $r++;
+
+
+    }
+}
diff --git a/htdocs/includes/escpos/.gitignore b/htdocs/includes/escpos/.gitignore
new file mode 100644
index 00000000000..0e8fc4a31ee
--- /dev/null
+++ b/htdocs/includes/escpos/.gitignore
@@ -0,0 +1,12 @@
+# Eclipse files
+.settings/*
+.project
+.buildpath
+
+# doxygen files
+doc/html
+doc/latex
+doc/doxygen_sqlite3.db
+
+# composer files
+vendor/
diff --git a/htdocs/includes/escpos/Escpos.php b/htdocs/includes/escpos/Escpos.php
new file mode 100644
index 00000000000..57e7eb2c8ac
--- /dev/null
+++ b/htdocs/includes/escpos/Escpos.php
@@ -0,0 +1,851 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ * 
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ * 
+ * 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.
+ * 
+ * This class generates ESC/POS printer control commands for compatible printers.
+ * See README.md for a summary of compatible printers and supported commands, and
+ * basic usage.
+ * 
+ * See example/demo.php for a detailed print-out demonstrating the range of commands
+ * implemented in this project.
+ * 
+ * Note that some functions have not been implemented:
+ * 		- Set paper sensors
+ * 		- Select print colour
+ * 
+ * Please direct feature requests, bug reports and contributions to escpos-php
+ * on Github:
+ * 		- https://github.com/mike42/escpos-php
+ */
+require_once(dirname(__FILE__) . "/src/EscposImage.php");
+require_once(dirname(__FILE__) . "/src/PrintBuffer.php");
+require_once(dirname(__FILE__) . "/src/EscposPrintBuffer.php");
+require_once(dirname(__FILE__) . "/src/PrintConnector.php");
+require_once(dirname(__FILE__) . "/src/WindowsPrintConnector.php");
+require_once(dirname(__FILE__) . "/src/FilePrintConnector.php");
+require_once(dirname(__FILE__) . "/src/NetworkPrintConnector.php");
+require_once(dirname(__FILE__) . "/src/AbstractCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/DefaultCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/SimpleCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/EposTepCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/StarCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/P822DCapabilityProfile.php");
+require_once(dirname(__FILE__) . "/src/CodePage.php");
+require_once(dirname(__FILE__) . "/src/ImagePrintBuffer.php");
+
+class Escpos {
+	/* ASCII codes */
+	const NUL = "\x00";
+	const LF = "\x0a";
+	const ESC = "\x1b";
+	const FS = "\x1c";
+	const FF = "\x0c";
+	const GS = "\x1d";
+	const DLE = "\x10";
+	const EOT = "\x04";
+
+	/* Barcode types */
+	const BARCODE_UPCA = 65;
+	const BARCODE_UPCE = 66;
+	const BARCODE_JAN13 = 67;
+	const BARCODE_JAN8 = 68;
+	const BARCODE_CODE39 = 69;
+	const BARCODE_ITF = 70;
+	const BARCODE_CODABAR = 71;
+	const BARCODE_CODE93 = 72;
+	const BARCODE_CODE128 = 73;
+	
+	/* Barcode HRI (human-readable interpretation) text position */
+	const BARCODE_TEXT_NONE = 0;
+	const BARCODE_TEXT_ABOVE = 1;
+	const BARCODE_TEXT_BELOW = 2;
+	
+	/* Cut types */
+	const CUT_FULL = 65;
+	const CUT_PARTIAL = 66;
+	
+	/* Fonts */
+	const FONT_A = 0;
+	const FONT_B = 1;
+	const FONT_C = 2;
+	
+	/* Image sizing options */
+	const IMG_DEFAULT = 0;
+	const IMG_DOUBLE_WIDTH = 1;
+	const IMG_DOUBLE_HEIGHT = 2;
+	
+	/* Justifications */
+	const JUSTIFY_LEFT = 0;
+	const JUSTIFY_CENTER = 1;
+	const JUSTIFY_RIGHT = 2;
+	
+	/* Print mode constants */
+	const MODE_FONT_A = 0;
+	const MODE_FONT_B = 1;
+	const MODE_EMPHASIZED = 8;
+	const MODE_DOUBLE_HEIGHT = 16;
+	const MODE_DOUBLE_WIDTH = 32;
+	const MODE_UNDERLINE = 128;
+	
+	/* QR code error correction levels */
+	const QR_ECLEVEL_L = 0;
+	const QR_ECLEVEL_M = 1;
+	const QR_ECLEVEL_Q = 2;
+	const QR_ECLEVEL_H = 3;
+	
+	/* QR code models */
+	const QR_MODEL_1 = 1;
+	const QR_MODEL_2 = 2;
+	const QR_MICRO = 3;
+	
+	/* Printer statuses */
+	const STATUS_PRINTER = 1;
+	const STATUS_OFFLINE_CAUSE = 2;
+	const STATUS_ERROR_CAUSE = 3;
+	const STATUS_PAPER_ROLL = 4;
+	const STATUS_INK_A = 7;
+	const STATUS_INK_B = 6;
+	const STATUS_PEELER = 8;
+	
+	/* Underline */
+	const UNDERLINE_NONE = 0;
+	const UNDERLINE_SINGLE = 1;
+	const UNDERLINE_DOUBLE = 2;
+	
+	/**
+	 * @var PrintBuffer The printer's output buffer.
+	 */
+	private $buffer;
+	
+	/**
+	 * @var PrintConnector
+	 */
+	private $connector;
+
+	/**
+	 * @var AbstractCapabilityProfile
+	 */
+	private $profile;
+	
+	/**
+	 * @var int Current character code table
+	 */
+	private $characterTable;
+
+	/**
+	 * Construct a new print object
+	 *
+	 * @param PrintConnector $connector The PrintConnector to send data to. If not set, output is sent to standard output.
+	 * @param AbstractCapabilityProfile $profile Supported features of this printer. If not set, the DefaultCapabilityProfile will be used, which is suitable for Epson printers.
+	 * @throws InvalidArgumentException
+	 */
+	function __construct(PrintConnector $connector = null, AbstractCapabilityProfile $profile = null) {
+		if(is_null($connector)) {
+			if(php_sapi_name() == 'cli') {
+				$connector = new FilePrintConnector("php://stdout");
+			} else {
+				throw new InvalidArgumentException("Argument passed to Escpos::__construct() must implement interface PrintConnector, null given.");
+			}
+		}
+		/* Set connector */
+		$this -> connector = $connector;
+		
+		/* Set capability profile */
+		if($profile === null) {
+			$profile = DefaultCapabilityProfile::getInstance();
+		}
+		$this -> profile = $profile;
+		/* Set buffer */
+		$buffer = new EscposPrintBuffer();
+		$this -> buffer = null;
+		$this -> setPrintBuffer($buffer);
+		$this -> initialize();
+	}
+	
+	/**
+	 * Print a barcode.
+	 *
+	 * @param string $content The information to encode.
+	 * @param int $type The barcode standard to output. If not specified, `Escpos::BARCODE_CODE39` will be used. Note that some barcode formats only support specific lengths or sets of characters.
+	 * @throws InvalidArgumentException Where the length or characters used in $content is invalid for the requested barcode format.
+	 */
+	function barcode($content, $type = self::BARCODE_CODE39) {
+		/* Validate input */
+		self::validateInteger($type, 65, 73, __FUNCTION__, "Barcode type");
+		$len = strlen($content);
+		switch($type) {
+			case self::BARCODE_UPCA:
+				self::validateInteger($len, 11, 12, __FUNCTION__, "UPCA barcode content length");
+				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{11,12}$/", "UPCA barcode content");
+				break;
+			case self::BARCODE_UPCE:
+				self::validateIntegerMulti($len, array(array(6, 8), array(11, 12)), __FUNCTION__, "UPCE barcode content length");
+				self::validateStringRegex($content, __FUNCTION__, "/^([0-9]{6,8}|[0-9]{11,12})$/",  "UPCE barcode content");
+				break;
+			case self::BARCODE_JAN13:
+				self::validateInteger($len, 12, 13, __FUNCTION__, "JAN13 barcode content length");
+				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{12,13}$/", "JAN13 barcode content");
+				break;
+			case self::BARCODE_JAN8:
+				self::validateInteger($len, 7, 8, __FUNCTION__, "JAN8 barcode content length");
+				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{7,8}$/", "JAN8 barcode content");
+				break;
+			case self::BARCODE_CODE39:
+				self::validateInteger($len, 1, 255, __FUNCTION__, "CODE39 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
+				self::validateStringRegex($content, __FUNCTION__, "/^([0-9A-Z \$\%\+\-\.\/]+|\*[0-9A-Z \$\%\+\-\.\/]+\*)$/", "CODE39 barcode content");
+				break;
+			case self::BARCODE_ITF:
+				self::validateInteger($len, 2, 255, __FUNCTION__, "ITF barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
+				self::validateStringRegex($content, __FUNCTION__, "/^([0-9]{2})+$/", "ITF barcode content");
+				break;
+			case self::BARCODE_CODABAR:
+				self::validateInteger($len, 1, 255, __FUNCTION__, "Codabar barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
+				self::validateStringRegex($content, __FUNCTION__, "/^[A-Da-d][0-9\$\+\-\.\/\:]+[A-Da-d]$/", "Codabar barcode content");
+				break;
+			case self::BARCODE_CODE93:
+				self::validateInteger($len, 1, 255, __FUNCTION__, "Code93 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
+				self::validateStringRegex($content, __FUNCTION__, "/^[\\x00-\\x7F]+$/", "Code93 barcode content");
+				break;
+			case self::BARCODE_CODE128:
+				self::validateInteger($len, 1, 255, __FUNCTION__, "Code128 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
+				// The CODE128 encoder is quite complex, so only a very basic header-check is applied here.
+				self::validateStringRegex($content, __FUNCTION__, "/^\{[A-C][\\x00-\\x7F]+$/", "Code128 barcode content");
+				break;
+		}
+ 		if(!$this -> profile -> getSupportsBarcodeB()) {
+			// A simpler barcode command which supports fewer codes
+			self::validateInteger($type, 65, 71, __FUNCTION__);
+			$this -> connector -> write(self::GS . "k" . chr($type - 65) . $content . self::NUL);
+			return;
+ 		}
+ 		// More advanced function B, used in preference
+ 		$this -> connector -> write(self::GS . "k" . chr($type) . chr(strlen($content)) . $content);
+	}
+	
+	/**
+	 * Print an image, using the older "bit image" command. This creates padding on the right of the image,
+	 * if its width is not divisible by 8.
+	 * 
+	 * Should only be used if your printer does not support the graphics() command.
+	 * 
+	 * @param EscposImage $img The image to print
+	 * @param EscposImage $size Size modifier for the image.
+	 */
+	function bitImage(EscposImage $img, $size = self::IMG_DEFAULT) {
+		self::validateInteger($size, 0, 3, __FUNCTION__);
+		$header = self::dataHeader(array($img -> getWidthBytes(), $img -> getHeight()), true);
+		$this -> connector -> write(self::GS . "v0" . chr($size) . $header);
+		$this -> connector -> write($img -> toRasterFormat());
+	}
+	
+	/**
+	 * Close the underlying buffer. With some connectors, the
+	 * job will not actually be sent to the printer until this is called.
+	 */
+	function close() {
+		$this -> connector -> finalize();
+	}
+	
+	/**
+	 * Cut the paper.
+	 *
+	 * @param int $mode Cut mode, either Escpos::CUT_FULL or Escpos::CUT_PARTIAL. If not specified, `Escpos::CUT_FULL` will be used.
+	 * @param int $lines Number of lines to feed
+	 */
+	function cut($mode = self::CUT_FULL, $lines = 3) {
+		// TODO validation on cut() inputs
+		$this -> connector -> write(self::GS . "V" . chr($mode) . chr($lines));
+	}
+	
+	/**
+	 * Print and feed line / Print and feed n lines.
+	 * 
+	 * @param int $lines Number of lines to feed
+	 */
+	function feed($lines = 1) {
+		self::validateInteger($lines, 1, 255, __FUNCTION__);
+		if($lines <= 1) {
+			$this -> connector -> write(self::LF);
+		} else {
+			$this -> connector -> write(self::ESC . "d" . chr($lines));
+		}
+	}
+
+	/**
+	 * Some printers require a form feed to release the paper. On most printers, this 
+	 * command is only useful in page mode, which is not implemented in this driver.
+	 */
+	function feedForm() {
+		$this -> connector -> write(self::FF);	
+	}
+
+	/**
+	 * Print and reverse feed n lines.
+	 *
+	 * @param int $lines number of lines to feed. If not specified, 1 line will be fed.
+	 */
+	function feedReverse($lines = 1) {
+		self::validateInteger($lines, 1, 255, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "e" . chr($lines));
+	}
+
+	/**
+	 * @return number
+	 */
+	function getCharacterTable() {
+		return $this -> characterTable;
+	}
+	
+	/**
+	 * @return PrintBuffer
+	 */
+	function getPrintBuffer() {
+		return $this -> buffer;
+	}
+
+	/**
+	 * @return PrintConnector
+	 */
+	function getPrintConnector() {
+		return $this -> connector;
+	}
+
+	/**
+	 * @return AbstractCapabilityProfile
+	 */
+	function getPrinterCapabilityProfile() {
+		return $this -> profile;
+	}
+
+	/**
+	 * @param int $type The type of status to request
+	 * @return stdClass Class containing requested status, or null if either no status was received, or your print connector is unable to read from the printer.
+	 */
+	function getPrinterStatus($type = self::STATUS_PRINTER) {
+		self::validateIntegerMulti($type, array(array(1, 4), array(6, 8)), __FUNCTION__);
+		// Determine which flags we are looking for
+		$statusFlags = array(
+				self::STATUS_PRINTER => array(
+					4 => "pulseHigh", // connector pin 3, see pulse().
+					8 => "offline",
+					32 => "waitingForOnlineRecovery",
+					64 => "feedButtonPressed"
+				),
+				self::STATUS_OFFLINE_CAUSE => array(
+					4 => "coverOpen",
+					8 => "paperManualFeed",
+					32 => "paperEnd",
+					64 => "errorOccurred"
+				),
+				self::STATUS_ERROR_CAUSE => array(
+					4 => "recoverableError",
+					8 => "autocutterError",
+					32 => "unrecoverableError",
+					64 => "autorecoverableError"
+				),
+				self::STATUS_PAPER_ROLL => array(
+					4 => "paperNearEnd",
+					32 => "paperNotPresent"
+				),
+				self::STATUS_INK_A => array(
+					4 => "inkNearEnd",
+					8 => "inkEnd",
+					32 => "inkNotPresent",
+					64 => "cleaning"
+				),
+				self::STATUS_INK_B => array(
+					4 => "inkNearEnd",
+					8 => "inkEnd",
+					32 => "inkNotPresent"
+				),
+				self::STATUS_PEELER => array(
+					4 => "labelWaitingForRemoval",
+					32 => "labelPaperNotDetected"
+				)
+		);
+		$flags = $statusFlags[$type];
+		// Clear any previous statuses which haven't been read yet
+		$f = $this -> connector -> read(1);
+		// Make request
+		$reqC = chr($type);
+		switch($type) {
+			// Special cases: These are two-character requests
+			case self::STATUS_INK_A:
+				$reqC = chr(7) . chr(1);
+				break;
+			case self::STATUS_INK_B:
+				$reqC = chr(7) . chr(2);
+				break;
+			case self::STATUS_PEELER:
+				$reqC = chr(8) . chr(3);
+				break;
+		}
+		$this -> connector -> write(self::DLE . self::EOT . $reqC);
+		// Wait for single-character response
+		$f = $this -> connector -> read(1);
+		$i = 0;
+		while($f === false && $i < 50000) {
+			usleep(100);
+			$f = $this -> connector -> read(1);
+			$i++;
+		}
+		if($f === false) {
+			// Timeout
+			return null;
+		}
+		$ret = new stdClass();
+		foreach($flags as $num => $name) {
+			$ret -> $name = (ord($f) & $num) != 0;
+		}
+		return $ret;
+	}
+	
+	/**
+	 * Print an image to the printer.
+	 * 
+	 * Size modifiers are:
+	 * - IMG_DEFAULT (leave image at original size)
+	 * - IMG_DOUBLE_WIDTH
+	 * - IMG_DOUBLE_HEIGHT
+	 * 
+	 * See the example/ folder for detailed examples.
+	 * 
+	 * The function bitImage() takes the same parameters, and can be used if
+	 * your printer doesn't support the newer graphics commands.
+	 * 
+	 * @param EscposImage $img The image to print.
+	 * @param int $size Output size modifier for the image.
+	 */
+	function graphics(EscposImage $img, $size = self::IMG_DEFAULT) {
+		self::validateInteger($size, 0, 3, __FUNCTION__);
+		$imgHeader = self::dataHeader(array($img -> getWidth(), $img -> getHeight()), true);
+		$tone = '0';
+		$colors = '1';
+		$xm = (($size & self::IMG_DOUBLE_WIDTH) == self::IMG_DOUBLE_WIDTH) ? chr(2) : chr(1);
+		$ym = (($size & self::IMG_DOUBLE_HEIGHT) == self::IMG_DOUBLE_HEIGHT) ? chr(2) : chr(1);
+		$header = $tone . $xm . $ym . $colors . $imgHeader;
+		$this -> wrapperSendGraphicsData('0', 'p', $header . $img -> toRasterFormat());
+		$this -> wrapperSendGraphicsData('0', '2');
+	}
+	
+	/**
+	 * Initialize printer. This resets formatting back to the defaults.
+	 */
+	function initialize() {
+		$this -> connector -> write(self::ESC . "@");
+		$this -> characterTable = 0;
+	}
+	
+	/**
+	 * Generate a pulse, for opening a cash drawer if one is connected.
+	 * The default settings should open an Epson drawer.
+	 *
+	 * @param int $pin 0 or 1, for pin 2 or pin 5 kick-out connector respectively.
+	 * @param int $on_ms pulse ON time, in milliseconds.
+	 * @param int $off_ms pulse OFF time, in milliseconds.
+	 */
+	function pulse($pin = 0, $on_ms = 120, $off_ms = 240) {
+		self::validateInteger($pin, 0, 1, __FUNCTION__);
+		self::validateInteger($on_ms, 1, 511, __FUNCTION__);
+		self::validateInteger($off_ms, 1, 511, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "p" . chr($pin + 48) . chr($on_ms / 2) . chr($off_ms / 2));
+	}
+	
+	/**
+	 * Print the given data as a QR code on the printer.
+	 * 
+	 * @param string $content The content of the code. Numeric data will be more efficiently compacted.
+	 * @param int $ec Error-correction level to use. One of Escpos::QR_ECLEVEL_L (default), Escpos::QR_ECLEVEL_M, Escpos::QR_ECLEVEL_Q or Escpos::QR_ECLEVEL_H. Higher error correction results in a less compact code.
+	 * @param int $size Pixel size to use. Must be 1-16 (default 3)
+	 * @param int $model QR code model to use. Must be one of Escpos::QR_MODEL_1, Escpos::QR_MODEL_2 (default) or Escpos::QR_MICRO (not supported by all printers).
+	 */
+	function qrCode($content, $ec = self::QR_ECLEVEL_L, $size = 3, $model = self::QR_MODEL_2) {
+		self::validateString($content, __FUNCTION__);
+		self::validateInteger($ec, 0, 3, __FUNCTION__);
+		self::validateInteger($size, 1, 16, __FUNCTION__);
+		self::validateInteger($model, 1, 3, __FUNCTION__);
+		if($content == "") {
+			return;
+		}
+		if(!$this -> profile -> getSupportsQrCode()) {
+			// TODO use software rendering via phpqrcode instead
+			throw new Exception("QR codes are not supported on your printer.");
+		}
+		$cn = '1'; // Code type for QR code
+		// Select model: 1, 2 or micro.
+		$this -> wrapperSend2dCodeData(chr(65), $cn, chr(48 + $model) . chr(0));
+		// Set dot size.
+		$this -> wrapperSend2dCodeData(chr(67), $cn, chr($size));
+		// Set error correction level: L, M, Q, or H
+		$this -> wrapperSend2dCodeData(chr(69), $cn, chr(48 + $ec));
+		// Send content & print
+		$this -> wrapperSend2dCodeData(chr(80), $cn, $content, '0');
+		$this -> wrapperSend2dCodeData(chr(81), $cn, '', '0');
+	}
+
+	/**
+	 * Switch character table (code page) manually. Used in conjunction with textRaw() to
+	 * print special characters which can't be encoded automatically.
+	 * 
+	 * @param int $table The table to select. Available code tables are model-specific.
+	 */
+	function selectCharacterTable($table = 0) {
+		self::validateInteger($table, 0, 255, __FUNCTION__);
+		$supported = $this -> profile -> getSupportedCodePages();
+		if(!isset($supported[$table])) {
+			throw new InvalidArgumentException("There is no code table $table allowed by this printer's capability profile.");
+		}
+		$this -> characterTable = $table;
+		if($this -> profile -> getSupportsStarCommands()) {
+			/* Not an ESC/POS command: STAR printers stash all the extra code pages under a different command. */
+			$this -> connector -> write(self::ESC . self::GS . "t" . chr($table));
+			return;
+		}
+		$this -> connector -> write(self::ESC . "t" . chr($table));
+	}
+
+	/**
+	 * Select print mode(s).
+	 * 
+	 * Several MODE_* constants can be OR'd together passed to this function's `$mode` argument. The valid modes are:
+	 *  - MODE_FONT_A
+	 *  - MODE_FONT_B
+	 *  - MODE_EMPHASIZED
+	 *  - MODE_DOUBLE_HEIGHT
+	 *  - MODE_DOUBLE_WIDTH
+	 *  - MODE_UNDERLINE
+	 * 
+	 * @param int $mode The mode to use. Default is Escpos::MODE_FONT_A, with no special formatting. This has a similar effect to running initialize().
+	 */
+	function selectPrintMode($mode = self::MODE_FONT_A) {
+		$allModes = self::MODE_FONT_B | self::MODE_EMPHASIZED | self::MODE_DOUBLE_HEIGHT | self::MODE_DOUBLE_WIDTH | self::MODE_UNDERLINE;
+		if(!is_integer($mode) || $mode < 0 || ($mode & $allModes) != $mode) {
+			throw new InvalidArgumentException("Invalid mode");
+		}
+
+		$this -> connector -> write(self::ESC . "!" . chr($mode));
+	}
+	
+	/**
+	 * Set barcode height.
+	 *
+	 * @param int $height Height in dots. If not specified, 8 will be used.
+	 */
+	function setBarcodeHeight($height = 8) {
+		self::validateInteger($height, 1, 255, __FUNCTION__);
+		$this -> connector -> write(self::GS . "h" . chr($height));
+	}
+	
+	
+	/**
+	 * Set the position for the Human Readable Interpretation (HRI) of barcode characters.
+	 * 
+	 * @param position $position. Use Escpos::BARCODE_TEXT_NONE to hide the text (default), or any combination of Escpos::BARCODE_TEXT_TOP and Escpos::BARCODE_TEXT_BOTTOM flags to display the text.
+	 */
+	function setBarcodeTextPosition($position = self::BARCODE_TEXT_NONE) {
+		self::validateInteger($position, 0, 3, __FUNCTION__, "Barcode text position");
+		$this -> connector -> write(self::GS . "H" . chr($position));
+	}
+	
+	/**
+	 * Turn double-strike mode on/off.
+	 *
+	 * @param boolean $on true for double strike, false for no double strike
+	 */
+	function setDoubleStrike($on = true) {
+		self::validateBoolean($on, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "G". ($on ? chr(1) : chr(0)));
+	}
+	
+	/**
+	 * Turn emphasized mode on/off.
+	 *
+	 *  @param boolean $on true for emphasis, false for no emphasis
+	 */
+	function setEmphasis($on = true) {
+		self::validateBoolean($on, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "E". ($on ? chr(1) : chr(0)));
+	}
+	
+	/**
+	 * Select font. Most printers have two fonts (Fonts A and B), and some have a third (Font C).
+	 *
+	 * @param int $font The font to use. Must be either Escpos::FONT_A, Escpos::FONT_B, or Escpos::FONT_C.
+	 */
+	function setFont($font = self::FONT_A) {
+		self::validateInteger($font, 0, 2, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "M" . chr($font));
+	}
+	
+	/**
+	 * Select justification.
+	 *
+	 * @param int $justification One of Escpos::JUSTIFY_LEFT, Escpos::JUSTIFY_CENTER, or Escpos::JUSTIFY_RIGHT.
+	 */
+	function setJustification($justification = self::JUSTIFY_LEFT) {
+		self::validateInteger($justification, 0, 2, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "a" . chr($justification));
+	}
+	
+	/**
+	 * Attach a different print buffer to the printer. Buffers are responsible for handling text output to the printer.
+	 * 
+	 * @param PrintBuffer $buffer The buffer to use.
+	 * @throws InvalidArgumentException Where the buffer is already attached to a different printer.
+	 */
+	function setPrintBuffer(PrintBuffer $buffer) {
+		if($buffer === $this -> buffer) {
+			return;
+		}
+		if($buffer -> getPrinter() != null) {
+			throw new InvalidArgumentException("This buffer is already attached to a printer.");
+		}
+		if($this -> buffer !== null) {
+			$this -> buffer -> setPrinter(null);
+		}
+		$this -> buffer = $buffer;
+		$this -> buffer -> setPrinter($this);
+	}
+	
+	/**
+	 * Set black/white reverse mode on or off. In this mode, text is printed white on a black background.
+	 * 
+	 * @param boolean $on True to enable, false to disable.
+	 */
+	function setReverseColors($on = true) {
+		self::validateBoolean($on, __FUNCTION__);
+		$this -> connector -> write(self::GS . "B" . ($on ? chr(1) : chr(0)));
+	}
+
+	/**
+	 * Set the size of text, as a multiple of the normal size.
+	 * 
+	 * @param int $widthMultiplier Multiple of the regular height to use (range 1 - 8)
+	 * @param int $heightMultiplier Multiple of the regular height to use (range 1 - 8)
+	 */
+	function setTextSize($widthMultiplier, $heightMultiplier) {
+		self::validateInteger($widthMultiplier, 1, 8, __FUNCTION__);
+		self::validateInteger($heightMultiplier, 1, 8, __FUNCTION__);
+		$c = pow(2,4) * ($widthMultiplier - 1) + ($heightMultiplier - 1);		
+		$this -> connector -> write(self::GS . "!" . chr($c));
+	}
+
+	/**
+	 * Set underline for printed text.
+	 * 
+	 * Argument can be true/false, or one of UNDERLINE_NONE,
+	 * UNDERLINE_SINGLE or UNDERLINE_DOUBLE.
+	 * 
+	 * @param int $underline Either true/false, or one of Escpos::UNDERLINE_NONE, Escpos::UNDERLINE_SINGLE or Escpos::UNDERLINE_DOUBLE. Defaults to Escpos::UNDERLINE_SINGLE.
+	 */
+	function setUnderline($underline = self::UNDERLINE_SINGLE) {
+		/* Map true/false to underline constants */
+		if($underline === true) {
+			$underline = self::UNDERLINE_SINGLE;
+		} else if($underline === false) {
+			$underline = self::UNDERLINE_NONE;
+		}
+		/* Set the underline */
+		self::validateInteger($underline, 0, 2, __FUNCTION__);
+		$this -> connector -> write(self::ESC . "-". chr($underline));
+	}
+	
+	/**
+	 * Add text to the buffer.
+	 *
+	 * Text should either be followed by a line-break, or feed() should be called
+	 * after this to clear the print buffer.
+	 *
+	 * @param string $str Text to print
+	 */
+	function text($str = "") {
+		self::validateString($str, __FUNCTION__);
+		$this -> buffer -> writeText((string)$str);
+	}
+	
+	/**
+	 * Add text to the buffer without attempting to interpret chararacter codes.
+	 *
+	 * Text should either be followed by a line-break, or feed() should be called
+	 * after this to clear the print buffer.
+	 *
+	 * @param string $str Text to print
+	 */
+	function textRaw($str = "") {
+		self::validateString($str, __FUNCTION__);
+		$this -> buffer -> writeTextRaw((string)$str);
+	}
+	
+	/**
+	 * Wrapper for GS ( k, to calculate and send correct data length.
+	 * 
+	 * @param string $fn Function to use
+	 * @param string $cn Output code type. Affects available data
+	 * @param string $data Data to send.
+	 * @param string $m Modifier/variant for function. Often '0' where used.
+	 * @throws InvalidArgumentException Where the input lengths are bad.
+	 */
+	private function wrapperSend2dCodeData($fn, $cn, $data = '', $m = '') {
+		if(strlen($m) > 1 || strlen($cn) != 1 || strlen($fn) != 1) {
+			throw new InvalidArgumentException("wrapperSend2dCodeData: cn and fn must be one character each.");
+		}
+		$header = $this -> intLowHigh(strlen($data) + strlen($m) + 2, 2);
+		$this -> connector -> write(self::GS . "(k" . $header . $cn . $fn . $m . $data);
+	}
+	
+	/**
+	 * Wrapper for GS ( L, to calculate and send correct data length.
+	 *
+	 * @param string $m Modifier/variant for function. Usually '0'.
+	 * @param string $fn Function number to use, as character.
+	 * @param string $data Data to send.
+	 * @throws InvalidArgumentException Where the input lengths are bad.
+	 */
+	private function wrapperSendGraphicsData($m, $fn, $data = '') {
+		if(strlen($m) != 1 || strlen($fn) != 1) {
+			throw new InvalidArgumentException("wrapperSendGraphicsData: m and fn must be one character each.");
+		}
+		$header = $this -> intLowHigh(strlen($data) + 2, 2);
+		$this -> connector -> write(self::GS . "(L" . $header . $m . $fn . $data);
+	}
+	
+	/**
+	 * Convert widths and heights to characters. Used before sending graphics to set the size.
+	 * 
+	 * @param array $inputs
+	 * @param boolean $long True to use 4 bytes, false to use 2
+	 * @return string
+	 */
+	private static function dataHeader(array $inputs, $long = true) {
+		$outp = array();
+		foreach($inputs as $input) {
+			if($long) {
+				$outp[] = Escpos::intLowHigh($input, 2);
+			} else {
+				self::validateInteger($input, 0 , 255, __FUNCTION__);
+				$outp[] = chr($input);
+			}
+		}
+		return implode("", $outp);
+	}
+	
+	/**
+	 * Generate two characters for a number: In lower and higher parts, or more parts as needed.
+	 * @param int $int Input number
+	 * @param int $length The number of bytes to output (1 - 4).
+	 */
+	private static function intLowHigh($input, $length) {
+		$maxInput = (256 << ($length * 8) - 1);
+		self::validateInteger($length, 1, 4, __FUNCTION__);
+		self::validateInteger($input, 0, $maxInput, __FUNCTION__);
+		$outp = "";
+		for($i = 0; $i < $length; $i++) {
+			$outp .= chr($input % 256);
+			$input = (int)($input / 256);
+		}
+		return $outp;
+	}
+	
+	/**
+	 * Throw an exception if the argument given is not a boolean
+	 * 
+	 * @param boolean $test the input to test
+	 * @param string $source the name of the function calling this
+	 */
+	protected static function validateBoolean($test, $source) {
+		if(!($test === true || $test === false)) {
+			throw new InvalidArgumentException("Argument to $source must be a boolean");
+		}
+	}
+	
+	/**
+	 * Throw an exception if the argument given is not an integer within the specified range
+	 * 
+	 * @param int $test the input to test
+	 * @param int $min the minimum allowable value (inclusive)
+	 * @param int $max the maximum allowable value (inclusive)
+	 * @param string $source the name of the function calling this
+	 * @param string $argument the name of the invalid parameter
+	 */
+	protected static function validateInteger($test, $min, $max, $source, $argument = "Argument") {
+		self::validateIntegerMulti($test, array(array($min, $max)), $source, $argument);
+	}
+	
+	/**
+	 * Throw an exception if the argument given is not an integer within one of the specified ranges
+	 *
+	 * @param int $test the input to test
+	 * @param arrray $ranges array of two-item min/max ranges.
+	 * @param string $source the name of the function calling this
+	 * @param string $source the name of the function calling this
+	 * @param string $argument the name of the invalid parameter
+	 */
+	protected static function validateIntegerMulti($test, array $ranges, $source, $argument = "Argument") {
+		if(!is_integer($test)) {
+			throw new InvalidArgumentException("$argument given to $source must be a number, but '$test' was given.");
+		}
+		$match = false;
+		foreach($ranges as $range) {
+			$match |= $test >= $range[0] && $test <= $range[1];
+		}
+		if(!$match) {
+			// Put together a good error "range 1-2 or 4-6"
+			$rangeStr = "range ";
+			for($i = 0; $i < count($ranges); $i++) {
+				$rangeStr .= $ranges[$i][0] . "-" . $ranges[$i][1];
+				if($i == count($ranges) - 1) {
+					continue;
+				} else if($i == count($ranges) - 2) {
+					$rangeStr .= " or ";
+				} else {
+					$rangeStr .= ", ";
+				}
+			}
+			throw new InvalidArgumentException("$argument given to $source must be in $rangeStr, but $test was given.");
+		}
+	}
+	
+	/**
+	 * Throw an exception if the argument given can't be cast to a string
+	 *
+	 * @param string $test the input to test
+	 * @param string $source the name of the function calling this
+	 * @param string $argument the name of the invalid parameter
+	 */
+	protected static function validateString($test, $source, $argument = "Argument") {
+		if (is_object($test) && !method_exists($test, '__toString')) {
+			throw new InvalidArgumentException("$argument to $source must be a string");
+		}
+	}
+	
+	protected static function validateStringRegex($test, $source, $regex, $argument = "Argument") {
+		if(preg_match($regex, $test) === 0) {
+			throw new InvalidArgumentException("$argument given to $source is invalid. It should match regex '$regex', but '$test' was given.");
+		}
+	}
+}
diff --git a/htdocs/includes/escpos/LICENSE.md b/htdocs/includes/escpos/LICENSE.md
new file mode 100644
index 00000000000..a0bebf6920b
--- /dev/null
+++ b/htdocs/includes/escpos/LICENSE.md
@@ -0,0 +1,27 @@
+escpos-php, a Thermal receipt printer library, for use with
+ESC/POS compatible printers.
+
+Copyright (c) 2014-15 Michael Billington <michael.billington@gmail.com>,
+incorporating modifications by:
+- Roni Saha <roni.cse@gmail.com>
+- Gergely Radics <gerifield@ustream.tv>
+- Warren Doyle <w.doyle@fuelled.co>
+
+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/escpos/README.md b/htdocs/includes/escpos/README.md
new file mode 100644
index 00000000000..43798bb0852
--- /dev/null
+++ b/htdocs/includes/escpos/README.md
@@ -0,0 +1,352 @@
+ESC/POS Print Driver for PHP
+============================
+This project implements a subset of Epson's ESC/POS protocol for thermal receipt printers. It allows you to generate and print receipts with basic formatting, cutting, and barcodes on a compatible printer.
+
+The library was developed to add drop-in support for receipt printing to any PHP app, including web-based point-of-sale (POS) applications.
+
+Basic usage
+-----------
+A "hello world" receipt can be generated easily (Call this `hello-world.php`):
+```php
+<?php
+require_once(dirname(__FILE__) . "/Escpos.php");
+$printer = new Escpos();
+$printer -> text("Hello World!\n");
+$printer -> cut();
+$printer -> close();
+```
+This would be printed as:
+```
+# Networked printer
+php hello-world.php | nc 10.x.x.x. 9100
+# Local printer
+php hello-world.php > /dev/...
+# Windows local printer
+php hello-world.php > foo.txt
+net use LPT1 \\server\printer
+copy foo.txt LPT1
+del foo.txt
+```
+
+From your web app, you could pass the output directly to a socket if your printer is networked:
+```php
+<?php
+require_once(dirname(__FILE__) . "/Escpos.php");
+$connector = new NetworkPrintConnector("10.x.x.x", 9100);
+$printer = new Escpos($connector);
+$printer -> text("Hello World!\n");
+$printer -> cut();
+$printer -> close();
+```
+
+Or to a local printer:
+```php
+<?php
+require_once(dirname(__FILE__) . "/Escpos.php");
+$connector = new FilePrintConnector("/dev/ttyS0");
+$printer = new Escpos($connector);
+$printer -> text("Hello World!\n");
+$printer -> cut();
+$printer -> close();
+```
+
+### Basic workflow
+The library should be initialised with a PrintConnector, which will pass on the data to your printer.
+Use the table under "Compatibility", or the examples below to choose the appropriate connector for your
+platform & interface. If no connector is specified, then standard output is used.
+
+When you have finished using the print object, call `close()` to finalize any data transfers.
+
+### Tips & examples
+On Linux, your printer device file will be somewhere like `/dev/lp0` (parallel), `/dev/usb/lp1` (USB), `/dev/ttyUSB0` (USB-Serial), `/dev/ttyS0` (serial).
+
+On Windows, the device files will be along the lines of `LPT1` (parallel) or `COM1` (serial). Use the `WindowsPrintConnector` to tap into system printing on Windows (eg. [Windows USB](https://github.com/mike42/escpos-php/tree/master/example/interface/windows-usb.php), [SMB](https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php) or [Windows LPT](https://github.com/mike42/escpos-php/tree/master/example/interface/windows-lpt.php)) - this submits print jobs via a queue rather than communicating directly with the printer.
+
+A complete real-world receipt can be found in the code of [Auth](https://github.com/mike42/Auth) in [ReceiptPrinter.php](https://github.com/mike42/Auth/blob/master/lib/misc/ReceiptPrinter.php). It includes justification, boldness, and a barcode.
+
+Other examples are located in the [example/](https://github.com/mike42/escpos-php/blob/master/example/) directory.
+
+Compatibility
+-------------
+
+### Interfaces and operating systems
+This driver is known to work with the following OS/interface combinations:
+
+<table>
+<tr>
+<th>&nbsp;</th>
+<th>Linux</th>
+<th>Mac</th>
+<th>Windows</th>
+</tr>
+<tr>
+<th>Ethernet</th>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
+</tr>
+<tr>
+<th>USB</th>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/linux-usb.php">Yes</a></td>
+<td>Not tested</td>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/windows-usb.php">Yes</a></td>
+</tr>
+<tr>
+<th>USB-serial</th>
+<td>Yes</td>
+<td>Yes</td>
+<td>Yes</td>
+</tr>
+<tr>
+<th>Serial</th>
+<td>Yes</td>
+<td>Yes</td>
+<td>Yes</td>
+</tr>
+<tr>
+<th>Parallel</th>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/windows-lpt.php">Yes</a></td>
+<td>Not tested</td>
+<td>Yes</td>
+</tr>
+<tr>
+<th>SMB shared</th>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php">Yes</a></td>
+<td>No</td>
+<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php">Yes</a></td>
+</tr>
+</table>
+
+### Printers
+Many thermal receipt printers support ESC/POS to some degree. This driver has been known to work with:
+
+- EPOS TEP 220M
+- Epson TM-T88III
+- Epson TM-T88IV
+- Epson TM-T70
+- Epson TM-T82II
+- Epson TM-T20
+- Epson TM-T70II
+- Epson TM-U220
+- Epson FX-890 (requires `feedForm()` to release paper).
+- Okipos 80 Plus III
+- P-822D
+- SEYPOS PRP-300 (Also marketed as TYSSO PRP-300)
+- Star TSP-650
+- Star TUP-592
+- Xprinter XP-Q800
+- Zijang NT-58H
+- Zijang ZJ-5870
+- Zijang ZJ-5890T (Marketed as POS 5890T)
+
+If you use any other printer with this code, please let me know so I can add it to the list.
+
+Available methods
+-----------------
+
+### __construct(PrintConnector $connector, AbstractCapabilityProfile $profile)
+Construct new print object.
+
+Parameters:
+- `PrintConnector $connector`: The PrintConnector to send data to. If not set, output is sent to standard output.
+- `AbstractCapabilityProfile $profile` Supported features of this printer. If not set, the DefaultCapabilityProfile will be used, which is suitable for Epson printers.
+
+See [example/interface/]("https://github.com/mike42/escpos-php/tree/master/example/interface/) for ways to open connections for different platforms and interfaces.
+
+### barcode($content, $type)
+Print a barcode.
+
+Parameters:
+
+- `string $content`: The information to encode.
+- `int $type`: The barcode standard to output. If not specified, `Escpos::BARCODE_CODE39` will be used.
+
+Currently supported barcode standards are (depending on your printer):
+
+- `BARCODE_UPCA`
+- `BARCODE_UPCE`
+- `BARCODE_JAN13`
+- `BARCODE_JAN8`
+- `BARCODE_CODE39`
+- `BARCODE_ITF`
+- `BARCODE_CODABAR`
+
+Note that some barcode standards can only encode numbers, so attempting to print non-numeric codes with them may result in strange behaviour.
+
+### bitImage(EscposImage $image, $size)
+See [graphics()](#graphicsescposimage-image-size) below.
+
+### cut($mode, $lines)
+Cut the paper.
+
+Parameters:
+
+- `int $mode`: Cut mode, either `Escpos::CUT_FULL` or `Escpos::CUT_PARTIAL`. If not specified, `Escpos::CUT_FULL` will be used.
+- `int $lines`: Number of lines to feed before cutting. If not specified, 3 will be used.
+
+### feed($lines)
+Print and feed line / Print and feed n lines.
+
+Parameters:
+
+- `int $lines`: Number of lines to feed
+
+### feedForm()
+Some printers require a form feed to release the paper. On most printers, this command is only useful in page mode, which is not implemented in this driver.
+
+### feedReverse($lines)
+Print and reverse feed n lines.
+
+Parameters:
+
+- `int $lines`: number of lines to feed. If not specified, 1 line will be fed.
+
+### graphics(EscposImage $image, $size)
+Print an image to the printer.
+
+Parameters:
+
+- `EscposImage $img`: The image to print.
+- `int $size`: Output size modifier for the image.
+
+Size modifiers are:
+
+- `IMG_DEFAULT` (leave image at original size)
+- `IMG_DOUBLE_WIDTH`
+- `IMG_DOUBLE_HEIGHT`
+
+A minimal example:
+
+```php
+<?php
+$img = new EscposImage("logo.png");
+$printer -> graphics($img);
+```
+
+See the [example/](https://github.com/mike42/escpos-php/blob/master/example/) folder for detailed examples.
+
+The function [bitImage()](#bitimageescposimage-image-size) takes the same parameters, and can be used if your printer doesn't support the newer graphics commands.
+
+### initialize()
+Initialize printer. This resets formatting back to the defaults.
+
+### pulse($pin, $on_ms, $off_ms)
+Generate a pulse, for opening a cash drawer if one is connected. The default settings (0, 120, 240) should open an Epson drawer.
+
+Parameters:
+
+- `int $pin`: 0 or 1, for pin 2 or pin 5 kick-out connector respectively.
+- `int $on_ms`: pulse ON time, in milliseconds.
+- `int $off_ms`: pulse OFF time, in milliseconds.
+
+### qrCode($content, $ec, $size, $model)
+Print the given data as a QR code on the printer.
+
+- `string $content`: The content of the code. Numeric data will be more efficiently compacted.
+- `int $ec` Error-correction level to use. One of `Escpos::QR_ECLEVEL_L` (default), `Escpos::QR_ECLEVEL_M`, `Escpos::QR_ECLEVEL_Q` or `Escpos::QR_ECLEVEL_H`. Higher error correction results in a less compact code.
+- `int $size`: Pixel size to use. Must be 1-16 (default 3)
+- `int $model`: QR code model to use. Must be one of `Escpos::QR_MODEL_1`, `Escpos::QR_MODEL_2` (default) or `Escpos::QR_MICRO` (not supported by all printers).
+
+### selectPrintMode($mode)
+Select print mode(s).
+
+Parameters:
+
+- `int $mode`: The mode to use. Default is `Escpos::MODE_FONT_A`, with no special formatting. This has a similar effect to running `initialize()`.
+
+Several MODE_* constants can be OR'd together passed to this function's `$mode` argument. The valid modes are:
+
+- `MODE_FONT_A`
+- `MODE_FONT_B`
+- `MODE_EMPHASIZED`
+- `MODE_DOUBLE_HEIGHT`
+- `MODE_DOUBLE_WIDTH`
+- `MODE_UNDERLINE`
+
+### setBarcodeHeight($height)
+Set barcode height.
+
+Parameters:
+
+- `int $height`: Height in dots. If not specified, 8 will be used.
+
+### setDoubleStrike($on)
+Turn double-strike mode on/off.
+
+Parameters:
+
+- `boolean $on`: true for double strike, false for no double strike.
+
+### setEmphasis($on)
+Turn emphasized mode on/off.
+
+Parameters:
+
+- `boolean $on`: true for emphasis, false for no emphasis.
+
+### setFont($font)
+Select font. Most printers have two fonts (Fonts A and B), and some have a third (Font C).
+
+Parameters:
+
+- `int $font`: The font to use. Must be either `Escpos::FONT_A`, `Escpos::FONT_B`, or `Escpos::FONT_C`.
+
+### setJustification($justification)
+Select justification.
+
+Parameters:
+
+- `int $justification`: One of `Escpos::JUSTIFY_LEFT`, `Escpos::JUSTIFY_CENTER`, or `Escpos::JUSTIFY_RIGHT`.
+
+### setReverseColors($on)
+Set black/white reverse mode on or off. In this mode, text is printed white on a black background.
+
+Parameters:
+
+- `boolean $on`: True to enable, false to disable.
+
+### setTextSize($widthMultiplier, $heightMultiplier)
+Set the size of text, as a multiple of the normal size.
+
+Parameters:
+
+- `int $widthMultiplier`: Multiple of the regular height to use (range 1 - 8).
+- `int $heightMultiplier`: Multiple of the regular height to use (range 1 - 8).
+
+### setUnderline($underline)
+Set underline for printed text.
+
+Parameters:
+
+- `int $underline`: Either `true`/`false`, or one of `Escpos::UNDERLINE_NONE`, `Escpos::UNDERLINE_SINGLE` or `Escpos::UNDERLINE_DOUBLE`. Defaults to `Escpos::UNDERLINE_SINGLE`.
+
+### text($str)
+Add text to the buffer. Text should either be followed by a line-break, or `feed()` should be called after this.
+
+Parameters:
+
+- `string $str`: The string to print.
+
+Further notes
+-------------
+Posts I've written up for people who are learning how to use receipt printers:
+
+* [What is ESC/POS, and how do I use it?](http://mike.bitrevision.com/blog/what-is-escpos-and-how-do-i-use-it), which documents the output of test.php.
+* [Setting up an Epson receipt printer](http://mike.bitrevision.com/blog/2014-20-26-setting-up-an-epson-receipt-printer)
+* [Getting a USB receipt printer working on Linux](http://mike.bitrevision.com/blog/2015-03-getting-a-usb-receipt-printer-working-on-linux)
+
+Other versions
+--------------
+Some forks of this project have been developed by others for specific use cases. Improvements from the following projects have been incorporated into escpos-php:
+
+- [wdoyle/EpsonESCPOS-PHP](https://github.com/wdoyle/EpsonESCPOS-PHP)
+- [ronisaha/php-esc-pos](https://github.com/ronisaha/php-esc-pos)
+
+Vendor documentation
+--------------------
+Epson notes that not all of its printers support all ESC/POS features, and includes a table in their documentation:
+
+* [FAQ about ESC/POS from Epson](http://content.epson.de/fileadmin/content/files/RSD/downloads/escpos.pdf)
+
+Note that many printers produced by other vendors use the same standard, and are compatible by varying degrees.
+
diff --git a/htdocs/includes/escpos/composer.json b/htdocs/includes/escpos/composer.json
new file mode 100644
index 00000000000..8ec2e6b215f
--- /dev/null
+++ b/htdocs/includes/escpos/composer.json
@@ -0,0 +1,36 @@
+{
+	"name": "mike42/escpos-php",
+	"type": "library",
+	"description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
+	"homepage": "https://github.com/mike42/escpos-php",
+	"keywords": ["receipt", "print", "escpos", "ESC-POS", "driver"],
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "Michael Billington",
+			"email": "michael.billington@gmail.com"
+		},
+		{
+			"name": "Roni Saha",
+			"email": "roni.cse@gmail.com"
+		},
+		{
+			"name": "Gergely Radics",
+			"email": "gerifield@ustream.tv"
+		},
+		{
+			"name": "Warren Doyle",
+			"email": "w.doyle@fuelled.co"
+		},
+		{
+			"name": "vharo",
+			"email": "vharo@geepok.com"
+		}
+	],
+	"require": {
+		"php": ">=5.3.0"
+	},
+	"require-dev": {
+	    "phpunit/phpunit": "4.5.*"
+	}
+}
diff --git a/htdocs/includes/escpos/composer.lock b/htdocs/includes/escpos/composer.lock
new file mode 100644
index 00000000000..ab6911c281d
--- /dev/null
+++ b/htdocs/includes/escpos/composer.lock
@@ -0,0 +1,975 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "fd25f2b816df83dabf03fe7259ad4018",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Instantiator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2014-10-13 12:58:55"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
+                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2015-03-27 19:31:25"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.0.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
+                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "~1.0",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-01-24 10:06:35"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10 15:34:57"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2014-01-30 17:20:04"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2013-08-02 07:42:54"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-01-17 09:51:32"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
+                "phpunit/php-file-iterator": "~1.3.2",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.2",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.5.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-03-29 09:24:05"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
+                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "~1.0,>=1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-04-02 05:36:41"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
+                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-01-29 16:28:08"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-02-22 15:13:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2015-01-01 10:01:08"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "84839970d05254c73cde183a721c7af13aede943"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
+                "reference": "84839970d05254c73cde183a721c7af13aede943",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-01-27 07:23:06"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-10-06 09:23:50"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
+                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-01-24 09:48:32"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
+                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-02-24 06:35:25"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.6.6",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml.git",
+                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
+                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com",
+            "time": "2015-03-30 15:54:10"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.0"
+    },
+    "platform-dev": []
+}
diff --git a/htdocs/includes/escpos/doc/Makefile b/htdocs/includes/escpos/doc/Makefile
new file mode 100644
index 00000000000..fed323f0cff
--- /dev/null
+++ b/htdocs/includes/escpos/doc/Makefile
@@ -0,0 +1,9 @@
+html: ../Escpos.php escpos.conf
+	doxygen escpos.conf
+
+latex: html
+	# Do nothing
+
+clean:
+	rm --preserve-root -Rf html latex doxygen_sqlite3.db
+
diff --git a/htdocs/includes/escpos/doc/escpos.conf b/htdocs/includes/escpos/doc/escpos.conf
new file mode 100644
index 00000000000..01c76dc422a
--- /dev/null
+++ b/htdocs/includes/escpos/doc/escpos.conf
@@ -0,0 +1,2352 @@
+# Doxyfile 1.8.8
+
+# 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           = "escpos-php"
+
+# 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         =
+
+# 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          =
+
+# With the PROJECT_LOGO tag one can specify an logo or 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           = ../example/images/escpos-php-small.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       =
+
+# 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         = NO
+
+# 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    = NO
+
+# 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           = YES
+
+# 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      = NO
+
+# 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 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 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
+
+# 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        = NO
+
+# 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         = NO
+
+# 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. When 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   = NO
+
+# 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     = NO
+
+# 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       = YES
+
+# 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 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        = YES
+
+# 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       = 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           =
+
+#---------------------------------------------------------------------------
+# 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.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ../Escpos.php ../src/ ../README.md
+
+# 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. 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, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# 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              = NO
+
+# 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                =
+
+# 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       = NO
+
+# 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       =
+
+# 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             =
+
+# 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.
+
+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.
+
+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 = ../README.md
+
+#---------------------------------------------------------------------------
+# 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         = NO
+
+# 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 = NO
+
+# 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    = NO
+
+# 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
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# 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            = html
+
+# 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 therefor more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra stylesheet files is of importance (e.g. the last
+# stylesheet 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 stylesheet 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 NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# 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  = NO
+
+# 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.doxygen.Publisher
+
+# 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  = Publisher
+
+# 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   = NO
+
+# 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 stylesheets (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
+
+# When 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 prerendered 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           = YES
+
+# 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 hosted 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         = YES
+
+# 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. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# 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 empy string,
+# for the replacement values of the other commands the user is refered 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_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
+
+#---------------------------------------------------------------------------
+# 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    =
+
+#---------------------------------------------------------------------------
+# 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   = YES
+
+# 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     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes 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         = YES
+
+# 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   = YES
+
+# 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: YES.
+
+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           = Helvetica
+
+# 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           = YES
+
+# 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.
+# 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.
+# 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.
+# 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, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# 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        = NO
+
+# 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.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+PLANTUML_JAR_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    = 50
+
+# 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        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES 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/includes/escpos/example/README.md b/htdocs/includes/escpos/example/README.md
new file mode 100644
index 00000000000..68b0dc77e7c
--- /dev/null
+++ b/htdocs/includes/escpos/example/README.md
@@ -0,0 +1,26 @@
+Examples
+--------
+
+This folder contains a collectoion of feature examples.
+Generally, demo.php is the fastest way to find out which features your
+printer supports.
+
+## Subfolders
+- `interface/` - contains examples for output interfaces: eg, parallel, serial, USB, network, file-based.
+- `specific/` - examples made in response to issues & questions. These cover specific languages, printers and interfaces, so hit narrower use cases.
+
+## List of examples
+
+Each example prints to standard output, so either edit the print connector, or redirect the output to your printer to see it in action. They are designed for developers: open them in a text editor before you run them!
+
+- `bit-image.php` - Prints a images to the printer using the older "bit image" commands.
+- `demo.php` - Demonstrates output using a large subset of availale features.
+- `qr-code.php` - Prints QR codes, if your printer supports it.
+- `character-encodings.php` - Shows available character encodings. Change from the DefaultCapabilityProfile to get more useful output for your specific printer.
+- `graphics.php` - The same output as `bit-image.php`, printed with the newer graphics commands (not supported on many non-Epson printers)
+- `receipt-with-logo.php` - A simple receipt containing a logo and basic formating.
+- `character-encodings-with-images.php` - The same as `character-encodings.php`, but also prints each string using an `ImagePrintBuffer`, showing compatibility gaps.
+- `print-from-html.php` - Runs `wkhtmltoimage` to convert HTML to an image, and then prints the image. (This is very slow)
+- `character-tables.php` - Prints a compact character code table for each available character set. Used to debug incorrect output from `character-encodings.php`.
+- `print-from-pdf.php` - Loads a PDF and prints each page in a few different ways (very slow as well)
+
diff --git a/htdocs/includes/escpos/example/barcode.php b/htdocs/includes/escpos/example/barcode.php
new file mode 100644
index 00000000000..5475b76c19d
--- /dev/null
+++ b/htdocs/includes/escpos/example/barcode.php
@@ -0,0 +1,181 @@
+<?php
+require_once (dirname ( __FILE__ ) . "/../Escpos.php");
+$printer = new Escpos ();
+$printer->setBarcodeHeight ( 40 );
+
+/* Text position */
+$printer->selectPrintMode ( Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH );
+$printer->text ( "Text position\n" );
+$printer->selectPrintMode ();
+$hri = array (
+		Escpos::BARCODE_TEXT_NONE => "No text",
+		Escpos::BARCODE_TEXT_ABOVE => "Above",
+		Escpos::BARCODE_TEXT_BELOW => "Below",
+		Escpos::BARCODE_TEXT_ABOVE | Escpos::BARCODE_TEXT_BELOW => "Both" 
+);
+foreach ( $hri as $position => $caption ) {
+	$printer->text ( $caption . "\n" );
+	$printer->setBarcodeTextPosition ( $position );
+	$printer->barcode ( "012345678901", Escpos::BARCODE_JAN13 );
+	$printer->feed ();
+}
+
+/* Barcode types */
+$standards = array (
+		Escpos::BARCODE_UPCA => array (
+				"title" => "UPC-A",
+				"caption" => "Fixed-length numeric product barcodes.",
+				"example" => array (
+						array (
+								"caption" => "12 char numeric including (wrong) check digit.",
+								"content" => "012345678901"
+						),
+						array (
+								"caption" => "Send 11 chars to add check digit automatically.",
+								"content" => "01234567890" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_UPCE => array (
+				"title" => "UPC-E",
+				"caption" => "Fixed-length numeric compact product barcodes.",
+				"example" => array (
+						array (
+								"caption" => "6 char numeric - auto check digit & NSC",
+								"content" => "123456" 
+						),
+						array (
+								"caption" => "7 char numeric - auto check digit",
+								"content" => "0123456"
+						),
+						array (
+								"caption" => "8 char numeric",
+								"content" => "01234567"
+						),
+						array (
+								"caption" => "11 char numeric - auto check digit",
+								"content" => "01234567890"
+						),
+						array (
+								"caption" => "12 char numeric including (wrong) check digit",
+								"content" => "012345678901"
+						) 
+				) 
+		),
+		Escpos::BARCODE_JAN13 => array (
+				"title" => "JAN13/EAN13",
+				"caption" => "Fixed-length numeric barcodes.",
+				"example" => array (
+						array (
+								"caption" => "12 char numeric - auto check digit",
+								"content" => "012345678901" 
+						),
+						array (
+								"caption" => "13 char numeric including (wrong) check digit",
+								"content" => "0123456789012" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_JAN8 => array (
+				"title" => "JAN8/EAN8",
+				"caption" => "Fixed-length numeric barcodes.",
+				"example" => array (
+						array (
+								"caption" => "7 char numeric - auto check digit",
+								"content" => "0123456" 
+						),
+						array (
+								"caption" => "8 char numeric including (wrong) check digit",
+								"content" => "01234567"
+						) 
+				) 
+		),
+		Escpos::BARCODE_CODE39 => array (
+				"title" => "Code39",
+				"caption" => "Variable length alphanumeric w/ some special chars.",
+				"example" => array (
+						array (
+								"caption" => "Text, numbers, spaces",
+								"content" => "ABC 012" 
+						),
+						array (
+								"caption" => "Special characters",
+								"content" => "$%+-./" 
+						),
+						array (
+								"caption" => "Extra char (*) Used as start/stop",
+								"content" => "*TEXT*" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_ITF => array (
+				"title" => "ITF",
+				"caption" => "Variable length numeric w/even number of digits,\nas they are encoded in pairs.",
+				"example" => array (
+						array (
+								"caption" => "Numeric- even number of digits",
+								"content" => "0123456789" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_CODABAR => array (
+				"title" => "Codabar",
+				"caption" => "Varaible length numeric with some allowable\nextra characters. ABCD/abcd must be used as\nstart/stop characters (one at the start, one\nat the end) to distinguish between barcode\napplications.",
+				"example" => array (
+						array (
+								"caption" => "Numeric w/ A A start/stop. ",
+								"content" => "A012345A" 
+						),
+						array (
+								"caption" => "Extra allowable characters",
+								"content" => "A012$+-./:A" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_CODE93 => array (
+				"title" => "Code93",
+				"caption" => "Variable length- any ASCII is available",
+				"example" => array (
+						array (
+								"caption" => "Text",
+								"content" => "012abcd" 
+						) 
+				) 
+		),
+		Escpos::BARCODE_CODE128 => array (
+				"title" => "Code128",
+				"caption" => "Variable length- any ASCII is available",
+				"example" => array (
+						array (
+								"caption" => "Code set A uppercase & symbols",
+								"content" => "{A" . "012ABCD" 
+						),
+						array (
+								"caption" => "Code set B general text",
+								"content" => "{B" . "012ABCDabcd" 
+						),
+						array (
+								"caption" => "Code set C compact numbers\n Sending chr(21) chr(32) chr(43)",
+								"content" => "{C" . chr ( 21 ) . chr ( 32 ) . chr ( 43 ) 
+						) 
+				) 
+		) 
+);
+$printer->setBarcodeTextPosition ( Escpos::BARCODE_TEXT_BELOW );
+foreach ( $standards as $type => $standard ) {
+	$printer->selectPrintMode ( Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH );
+	$printer->text ( $standard ["title"] . "\n" );
+	$printer->selectPrintMode ();
+	$printer->text ( $standard ["caption"] . "\n\n" );
+	foreach ( $standard ["example"] as $id => $barcode ) {
+		$printer->setEmphasis ( true );
+		$printer->text ( $barcode ["caption"] . "\n" );
+		$printer->setEmphasis ( false );
+		$printer->text ( "Content: " . $barcode ["content"] . "\n" );
+		$printer->barcode ( $barcode ["content"], $type );
+		$printer->feed ();
+	}
+}
+$printer->cut ();
+$printer->close ();
+
diff --git a/htdocs/includes/escpos/example/bit-image.php b/htdocs/includes/escpos/example/bit-image.php
new file mode 100644
index 00000000000..f3a4054d98f
--- /dev/null
+++ b/htdocs/includes/escpos/example/bit-image.php
@@ -0,0 +1,32 @@
+<?php
+/* Example print-outs using the older bit image print command */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+$printer = new Escpos();
+
+try {
+	$tux = new EscposImage("resources/tux.png");
+
+	$printer -> text("These example images are printed with the older\nbit image print command. You should only use\n\$p -> bitImage() if \$p -> graphics() does not\nwork on your printer.\n\n");
+	
+	$printer -> bitImage($tux);
+	$printer -> text("Regular Tux (bit image).\n");
+	$printer -> feed();
+	
+	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_WIDTH);
+	$printer -> text("Wide Tux (bit image).\n");
+	$printer -> feed();
+	
+	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_HEIGHT);
+	$printer -> text("Tall Tux (bit image).\n");
+	$printer -> feed();
+	
+	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT);
+	$printer -> text("Large Tux in correct proportion (bit image).\n");
+} catch(Exception $e) {
+	/* Images not supported on your PHP, or image file not found */
+	$printer -> text($e -> getMessage() . "\n");
+}
+
+$printer -> cut();
+$printer -> close();
+?>
diff --git a/htdocs/includes/escpos/example/character-encodings-with-images.php b/htdocs/includes/escpos/example/character-encodings-with-images.php
new file mode 100644
index 00000000000..a98bdbc96ae
--- /dev/null
+++ b/htdocs/includes/escpos/example/character-encodings-with-images.php
@@ -0,0 +1,59 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+
+/**
+ * This example builds on character-encodings.php, also providing an image-based rendering.
+ * This is quite slow, since a) the buffers are changed dozens of
+ * times in the example, and b) It involves sending very wide images, which printers don't like!
+ * 
+ * There are currently no test cases around the image printing, since it is an experimental feature.
+ *
+ * It does, however, illustrate the way that more encodings are available when image output is used.
+ */
+include(dirname(__FILE__) . '/resources/character-encoding-test-strings.inc');
+
+try {
+	// Enter connector and capability profile
+	$connector = new FilePrintConnector("php://stdout");
+	$profile = DefaultCapabilityProfile::getInstance();
+	$buffers = array(new EscposPrintBuffer(), new ImagePrintBuffer());
+
+	/* Print a series of receipts containing i18n example strings */
+	$printer = new Escpos($connector, $profile);
+	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
+	$printer -> text("Implemented languages\n");
+	$printer -> selectPrintMode();
+	foreach($inputsOk as $label => $str) {
+		$printer -> setEmphasis(true);
+		$printer -> text($label . ":\n");
+		$printer -> setEmphasis(false);
+		foreach($buffers as $buffer) {
+			$printer -> setPrintBuffer($buffer);
+			$printer -> text($str);
+		}
+		$printer -> setPrintBuffer($buffers[0]);
+	}
+	$printer -> feed();
+	
+	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
+	$printer -> text("Works in progress\n");
+	$printer -> selectPrintMode();
+	foreach($inputsNotOk as $label => $str) {
+		$printer -> setEmphasis(true);
+		$printer -> text($label . ":\n");
+		$printer -> setEmphasis(false);
+		foreach($buffers as $buffer) {
+			$printer -> setPrintBuffer($buffer);
+			$printer -> text($str);
+		}
+		$printer -> setPrintBuffer($buffers[0]);
+	}
+	$printer -> cut();
+
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
+
diff --git a/htdocs/includes/escpos/example/character-encodings.php b/htdocs/includes/escpos/example/character-encodings.php
new file mode 100644
index 00000000000..8a42ecd0847
--- /dev/null
+++ b/htdocs/includes/escpos/example/character-encodings.php
@@ -0,0 +1,58 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+
+/**
+ * This demonstrates available character encodings. Escpos-php accepts UTF-8,
+ * and converts this to lower-level data to the printer. This is a complex area, so be
+ * prepared to code a model-specific hack ('CapabilityProfile') for your printer.
+ * 
+ * If you run into trouble, please file an issue on GitHub, including at a minimum:
+ * - A UTF-8 test string in the language you're working in, and
+ * - A test print or link to a technical document which lists the available
+ *      code pages ('character code tables') for your printer.
+ * 
+ * The DefaultCapabilityProfile works for Espson-branded printers. For other models, you
+ * must use/create a PrinterCapabilityProfile for your printer containing a list of code
+ * page numbers for your printer- otherwise you will get mojibake.
+ * 
+ * If you do not intend to use non-English characters, then use SimpleCapabilityProfile,
+ * which has only the default encoding, effectively disabling code page changes.
+ */
+
+include(dirname(__FILE__) . '/resources/character-encoding-test-strings.inc');
+try {
+	// Enter connector and capability profile (to match your printer)
+	$connector = new FilePrintConnector("php://stdout");
+	$profile = DefaultCapabilityProfile::getInstance();
+	
+	/* Print a series of receipts containing i18n example strings */
+	$printer = new Escpos($connector, $profile);
+	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
+	$printer -> text("Implemented languages\n");
+	$printer -> selectPrintMode();
+	foreach($inputsOk as $label => $str) {
+		$printer -> setEmphasis(true);
+		$printer -> text($label . ":\n");
+		$printer -> setEmphasis(false);
+		$printer -> text($str);
+	}
+	$printer -> feed();
+	
+	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
+	$printer -> text("Works in progress\n");
+	$printer -> selectPrintMode();
+	foreach($inputsNotOk as $label => $str) {
+		$printer -> setEmphasis(true);
+		$printer -> text($label . ":\n");
+		$printer -> setEmphasis(false);
+		$printer -> text($str);
+	}
+	$printer -> cut();
+
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
+
diff --git a/htdocs/includes/escpos/example/character-tables.php b/htdocs/includes/escpos/example/character-tables.php
new file mode 100644
index 00000000000..1ce2c5c9f1e
--- /dev/null
+++ b/htdocs/includes/escpos/example/character-tables.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * This demo prints out supported code pages on your printer. This is intended
+ * for debugging character-encoding issues: If your printer does not work with
+ * a built-in capability profile, you need to check its documentation for
+ * supported code pages.
+ * 
+ * These are then loaded into a capability profile, which maps code page
+ * numbers to iconv encoding names on your particular printer. This script
+ * will print all configured code pages, so that you can check that the chosen
+ * iconv encoding name matches the actual code page contents.
+ * 
+ * If this is correctly set up for your printer, then the driver will try its
+ * best to map UTF-8 text into these code pages for you, allowing you to accept
+ * arbitrary input from a database, without worrying about encoding it for the printer.
+ */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+
+// Enter connector and capability profile (to match your printer)
+$connector = new FilePrintConnector("php://stdout");
+$profile = DefaultCapabilityProfile::getInstance();
+$verbose = false; // Skip tables which iconv wont convert to (ie, only print characters available with UTF-8 input)
+
+/* Print a series of receipts containing i18n example strings - Code below shouldn't need changing */
+$printer = new Escpos($connector, $profile);
+$codePages = $profile -> getSupportedCodePages();
+$first = true; // Print larger table for first code-page.
+foreach($codePages as $table => $name) {
+	/* Change printer code page */
+	$printer -> selectCharacterTable(255);
+	$printer -> selectCharacterTable($table);
+	/* Select & print a label for it */
+	$label = $name;
+	if($name === false) {
+		$label= " (not matched to iconv table)";
+	}
+	$printer -> setEmphasis(true);
+	$printer -> textRaw("Table $table: $label\n");
+	$printer -> setEmphasis(false);
+	if($name === false && !$verbose) {
+		continue; // Skip non-recognised
+	}
+	/* Print a table of available characters (first table is larger than subsequent ones */
+	if($first) {
+		$first = false;
+		compactCharTable($printer, 1, true);
+	} else {
+		compactCharTable($printer);
+	}
+}
+$printer -> cut();
+$printer -> close();
+
+function compactCharTable($printer, $start = 4, $header = false) {
+	/* Output a compact character table for the current encoding */
+	$chars = str_repeat(' ', 256);
+	for($i = 0; $i < 255; $i++) {
+		$chars[$i] = ($i > 32 && $i != 127) ? chr($i) : ' ';
+	}
+	if($header) {
+		$printer -> setEmphasis(true);
+		$printer -> textRaw("  0123456789ABCDEF0123456789ABCDEF\n");
+		$printer -> setEmphasis(false);
+	}
+ 	for($y = $start; $y < 8; $y++) {
+ 		$printer -> setEmphasis(true);
+ 		$printer -> textRaw(strtoupper(dechex($y * 2)) . " ");
+ 		$printer -> setEmphasis(false);
+ 		$printer -> textRaw(substr($chars, $y * 32, 32) . "\n");
+ 	}
+}
diff --git a/htdocs/includes/escpos/example/demo.php b/htdocs/includes/escpos/example/demo.php
new file mode 100644
index 00000000000..1c99e5cc880
--- /dev/null
+++ b/htdocs/includes/escpos/example/demo.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * This is a demo script for the functions of the PHP ESC/POS print driver,
+ * Escpos.php.
+ *
+ * Most printers implement only a subset of the functionality of the driver, so
+ * will not render this output correctly in all cases.
+ *
+ * @author Michael Billington <michael.billington@gmail.com>
+ */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+$printer = new Escpos();
+
+/* Initialize */
+$printer -> initialize();
+
+/* Text */
+$printer -> text("Hello world\n");
+$printer -> cut();
+
+/* Line feeds */
+$printer -> text("ABC");
+$printer -> feed(7);
+$printer -> text("DEF");
+$printer -> feedReverse(3);
+$printer -> text("GHI");
+$printer -> feed();
+$printer -> cut();
+
+/* Font modes */
+$modes = array(
+	Escpos::MODE_FONT_B,
+	Escpos::MODE_EMPHASIZED,
+	Escpos::MODE_DOUBLE_HEIGHT,
+	Escpos::MODE_DOUBLE_WIDTH,
+	Escpos::MODE_UNDERLINE);
+for($i = 0; $i < pow(2, count($modes)); $i++) {
+	$bits = str_pad(decbin($i), count($modes), "0", STR_PAD_LEFT);
+	$mode = 0;
+	for($j = 0; $j < strlen($bits); $j++) {
+		if(substr($bits, $j, 1) == "1") {
+			$mode |= $modes[$j];
+		}
+	}
+	$printer -> selectPrintMode($mode);
+	$printer -> text("ABCDEFGHIJabcdefghijk\n");
+}
+$printer -> selectPrintMode(); // Reset
+$printer -> cut();
+
+/* Underline */
+for($i = 0; $i < 3; $i++) {
+	$printer -> setUnderline($i);
+	$printer -> text("The quick brown fox jumps over the lazy dog\n");
+}
+$printer -> setUnderline(0); // Reset
+$printer -> cut();
+
+/* Cuts */
+$printer -> text("Partial cut\n(not available on all printers)\n");
+$printer -> cut(Escpos::CUT_PARTIAL);
+$printer -> text("Full cut\n");
+$printer -> cut(Escpos::CUT_FULL);
+
+/* Emphasis */
+for($i = 0; $i < 2; $i++) {
+	$printer -> setEmphasis($i == 1);
+	$printer -> text("The quick brown fox jumps over the lazy dog\n");
+}
+$printer -> setEmphasis(false); // Reset
+$printer -> cut();
+
+/* Double-strike (looks basically the same as emphasis) */
+for($i = 0; $i < 2; $i++) {
+	$printer -> setDoubleStrike($i == 1);
+	$printer -> text("The quick brown fox jumps over the lazy dog\n");
+}
+$printer -> setDoubleStrike(false);
+$printer -> cut();
+
+/* Fonts (many printers do not have a 'Font C') */
+$fonts = array(
+	Escpos::FONT_A,
+	Escpos::FONT_B,
+	Escpos::FONT_C);
+for($i = 0; $i < count($fonts); $i++) {
+	$printer -> setFont($fonts[$i]);
+	$printer -> text("The quick brown fox jumps over the lazy dog\n");
+}
+$printer -> setFont(); // Reset
+$printer -> cut();
+
+/* Justification */
+$justification = array(
+	Escpos::JUSTIFY_LEFT,
+	Escpos::JUSTIFY_CENTER,
+	Escpos::JUSTIFY_RIGHT);
+for($i = 0; $i < count($justification); $i++) {
+	$printer -> setJustification($justification[$i]);
+	$printer -> text("A man a plan a canal panama\n");
+}
+$printer -> setJustification(); // Reset
+$printer -> cut();
+
+/* Barcodes - see barcode.php for more detail */
+$printer -> setBarcodeHeight(80);
+$printer->setBarcodeTextPosition ( Escpos::BARCODE_TEXT_BELOW );
+$printer -> barcode("9876");
+$printer -> feed();
+$printer -> cut();
+
+/* Graphics - this demo will not work on some non-Epson printers */
+try {
+	$logo = new EscposImage("resources/escpos-php.png");
+	$imgModes = array(
+		Escpos::IMG_DEFAULT,
+		Escpos::IMG_DOUBLE_WIDTH,
+		Escpos::IMG_DOUBLE_HEIGHT,
+		Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
+	);
+	foreach($imgModes as $mode) {
+		$printer -> graphics($logo, $mode);
+	}
+} catch(Exception $e) {
+	/* Images not supported on your PHP, or image file not found */
+	$printer -> text($e -> getMessage() . "\n");
+}
+$printer -> cut();
+
+/* Bit image */
+try {
+	$logo = new EscposImage("resources/escpos-php.png");
+	$imgModes = array(
+		Escpos::IMG_DEFAULT,
+		Escpos::IMG_DOUBLE_WIDTH,
+		Escpos::IMG_DOUBLE_HEIGHT,
+		Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
+	);
+	foreach($imgModes as $mode) {
+		$printer -> bitImage($logo, $mode);
+	}
+} catch(Exception $e) {
+	/* Images not supported on your PHP, or image file not found */
+	$printer -> text($e -> getMessage() . "\n");
+}
+$printer -> cut();
+
+/* QR Code - see also the more in-depth demo at qr-code.php */
+$testStr = "Testing 123";
+$models = array(
+	Escpos::QR_MODEL_1 => "QR Model 1",
+	Escpos::QR_MODEL_2 => "QR Model 2 (default)",
+	Escpos::QR_MICRO => "Micro QR code\n(not supported on all printers)");
+foreach($models as $model => $name) {
+	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, 3, $model);
+	$printer -> text("$name\n");
+	$printer -> feed();
+}
+$printer -> cut();
+
+/* Pulse */
+$printer -> pulse();
+
+/* Always close the printer! On some PrintConnectors, no actual
+ * data is sent until the printer is closed. */
+$printer -> close();
+?>
diff --git a/htdocs/includes/escpos/example/graphics.php b/htdocs/includes/escpos/example/graphics.php
new file mode 100644
index 00000000000..7650b6b9a08
--- /dev/null
+++ b/htdocs/includes/escpos/example/graphics.php
@@ -0,0 +1,32 @@
+<?php
+/* Print-outs using the newer graphics print command */
+
+require_once(dirname(__FILE__) . "/../Escpos.php");
+$printer = new Escpos();
+
+try {
+	$tux = new EscposImage("resources/tux.png");
+	
+	$printer -> graphics($tux);
+	$printer -> text("Regular Tux.\n");
+	$printer -> feed();
+	
+	$printer -> graphics($tux, Escpos::IMG_DOUBLE_WIDTH);
+	$printer -> text("Wide Tux.\n");
+	$printer -> feed();
+	
+	$printer -> graphics($tux, Escpos::IMG_DOUBLE_HEIGHT);
+	$printer -> text("Tall Tux.\n");
+	$printer -> feed();
+	
+	$printer -> graphics($tux, Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT);
+	$printer -> text("Large Tux in correct proportion.\n");
+	
+	$printer -> cut();
+} catch(Exception $e) {
+	/* Images not supported on your PHP, or image file not found */
+	$printer -> text($e -> getMessage() . "\n");
+}
+
+$printer -> close();
+?>
diff --git a/htdocs/includes/escpos/example/interface/README.md b/htdocs/includes/escpos/example/interface/README.md
new file mode 100644
index 00000000000..96fe2eed2fb
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/README.md
@@ -0,0 +1,8 @@
+Interfaces
+----------
+This directory contains boilerpalte code to show you how to open a print connector
+to printers which are connected in different ways.
+
+To get a list of supported interfaces and operating systems, see the main README.md file for the project.
+
+If you have a printer interface with no example, and you want to help put one together, then please lodge a request on the bug tracker: https://github.com/mike42/escpos-php/issues
diff --git a/htdocs/includes/escpos/example/interface/ethernet.php b/htdocs/includes/escpos/example/interface/ethernet.php
new file mode 100644
index 00000000000..bfea443903c
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/ethernet.php
@@ -0,0 +1,22 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+/* Most printers are open on port 9100, so you just need to know the IP 
+ * address of your receipt printer, and then fsockopen() it on that port.
+ */
+try {
+	$connector = null;
+	//$connector = new NetworkPrintConnector("10.x.x.x", 9100);
+	
+	/* Print a "Hello world" receipt" */
+	$printer = new Escpos($connector);
+	$printer -> text("Hello World!\n");
+	$printer -> cut();
+	
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
+
diff --git a/htdocs/includes/escpos/example/interface/linux-usb.php b/htdocs/includes/escpos/example/interface/linux-usb.php
new file mode 100644
index 00000000000..9e1d96b91c0
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/linux-usb.php
@@ -0,0 +1,33 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+/**
+ * On Linux, use the usblp module to make your printer available as a device
+ * file. This is generally the default behaviour if you don't install any
+ * vendor drivers.
+ *
+ * Once this is done, use a FilePrintConnector to open the device.
+ *
+ * Troubleshooting: On Debian, you must be in the lp group to access this file.
+ * dmesg to see what happens when you plug in your printer to make sure no
+ * other drivers are unloading the module.
+ */
+try {
+	// Enter the device file for your USB printer here
+	$connector = null;
+	//$connector = new FilePrintConnector("/dev/usb/lp0");
+	//$connector = new FilePrintConnector("/dev/usb/lp1");
+	//$connector = new FilePrintConnector("/dev/usb/lp2");
+
+	/* Print a "Hello world" receipt" */
+	$printer = new Escpos($connector);
+	$printer -> text("Hello World!\n");
+	$printer -> cut();
+	
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
+
diff --git a/htdocs/includes/escpos/example/interface/smb.php b/htdocs/includes/escpos/example/interface/smb.php
new file mode 100644
index 00000000000..40988f553ee
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/smb.php
@@ -0,0 +1,51 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+/**
+ * Install the printer using USB printing support, and the "Generic / Text Only" driver,
+ * then share it.
+ * 
+ * Use a WindowsPrintConnector with the share name to print. This works on either
+ * Windows or Linux.
+ * 
+ * Troubleshooting: Fire up a command prompt/terminal, and ensure that (if your printer is
+ * shared as "Receipt Printer"), the following commands work.
+ * 
+ * Windows: (use an appropriate "net use" command if you need authentication)
+ * 	echo "Hello World" > testfile
+ *  ## If you need authentication, use "net use" to hook up the printer:
+ * 	# net use "\\computername\Receipt Printer" /user:Guest
+ * 	# net use "\\computername\Receipt Printer" /user:Bob secret
+ * 	# net use "\\computername\Receipt Printer" /user:workgroup\Bob secret
+ * 	copy testfile "\\computername\Receipt Printer"
+ * 	del testfile
+ * 
+ * GNU/Linux:
+ * 	# No authentication
+ * 	echo "Hello World" | smbclient "//computername/Receipt Printer" -c "print -" -N
+ * 	# Guest login
+ * 	echo "Hello World" | smbclient "//computername/Receipt Printer" -U Guest -c "print -" -N
+ *  # Basic username/password
+ * 	echo "Hello World" | smbclient "//computername/Receipt Printer" secret -U "Bob" -c "print -"
+ * 	# Including domain name
+ * 	echo "Hello World" | smbclient "//computername/Receipt Printer" secret -U "workgroup\\Bob" -c "print -"
+ */
+try {
+	// Enter the share name for your printer here, as a smb:// url format
+	$connector = null;
+	//$connector = new WindowsPrintConnector("smb://computername/Receipt Printer");
+	//$connector = new WindowsPrintConnector("smb://Guest@computername/Receipt Printer");
+	//$connector = new WindowsPrintConnector("smb://FooUser:secret@computername/workgroup/Receipt Printer");
+	//$connector = new WindowsPrintConnector("smb://User:secret@computername/Receipt Printer");
+	
+	/* Print a "Hello world" receipt" */
+	$printer = new Escpos($connector);
+	$printer -> text("Hello World!\n");
+	$printer -> cut();
+	
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
diff --git a/htdocs/includes/escpos/example/interface/windows-lpt.php b/htdocs/includes/escpos/example/interface/windows-lpt.php
new file mode 100644
index 00000000000..76294425cdc
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/windows-lpt.php
@@ -0,0 +1,30 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+/**
+ * Assuming your printer is available at LPT1,
+ * simpy instantiate a WindowsPrintConnector to it.
+ * 
+ * When troubleshooting, make sure you can send it 
+ * data from the command-line first:
+ * 	echo "Hello World" > LPT1
+ */
+try {
+	$connector = null;
+	//$connector = new WindowsPrintConnector("LPT1");
+	
+	// A FilePrintConnector will also work, but on non-Windows systems, writes
+	// to an actual file called 'LPT1' rather than giving a useful error.
+	// $connector = new FilePrintConnector("LPT1");
+
+	/* Print a "Hello world" receipt" */
+	$printer = new Escpos($connector);
+	$printer -> text("Hello World!\n");
+	$printer -> cut();
+
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
diff --git a/htdocs/includes/escpos/example/interface/windows-usb.php b/htdocs/includes/escpos/example/interface/windows-usb.php
new file mode 100644
index 00000000000..d4b550e2f93
--- /dev/null
+++ b/htdocs/includes/escpos/example/interface/windows-usb.php
@@ -0,0 +1,32 @@
+<?php
+/* Change to the correct path if you copy this example! */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+/**
+ * Install the printer using USB printing support, and the "Generic / Text Only" driver,
+ * then share it (you can use a firewall so that it can only be seen locally).
+ * 
+ * Use a WindowsPrintConnector with the share name to print.
+ * 
+ * Troubleshooting: Fire up a command prompt, and ensure that (if your printer is shared as
+ * "Receipt Printer), the following commands work:
+ * 
+ * 	echo "Hello World" > testfile
+ * 	copy testfile "\\%COMPUTERNAME%\Receipt Printer"
+ * 	del testfile
+ */
+try {
+	// Enter the share name for your USB printer here
+	$connector = null;
+	//$connector = new WindowsPrintConnector("Receipt Printer");
+
+	/* Print a "Hello world" receipt" */
+	$printer = new Escpos($connector);
+	$printer -> text("Hello World!\n");
+	$printer -> cut();
+	
+	/* Close printer */
+	$printer -> close();
+} catch(Exception $e) {
+	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
+}
diff --git a/htdocs/includes/escpos/example/print-from-html.php b/htdocs/includes/escpos/example/print-from-html.php
new file mode 100644
index 00000000000..f0751d7a4ae
--- /dev/null
+++ b/htdocs/includes/escpos/example/print-from-html.php
@@ -0,0 +1,53 @@
+<?php
+require_once(dirname(__FILE__)."/../Escpos.php");
+/*
+ * Due to its complxity, escpos-php does not support HTML input. To print HTML,
+ * either convert it to calls on the Escpos() object, or rasterise the page with
+ * wkhtmltopdf, an external package which is designed to handle HTML efficiently.
+ *
+ * This example is provided to get you started.
+ *
+ * Note: Depending on the height of your pages, it is suggested that you chop it
+ * into smaller sections, as printers simply don't have the buffer capacity for
+ * very large images.
+ *
+ * As always, you can trade off quality for capacity by halving the width
+ * (550 -> 225 below) and printing w/ Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
+ */
+try {
+	/* Set up command */
+	$source = "http://en.m.wikipedia.org/wiki/ESC/P";
+	$width = 550;
+	$dest = tempnam(sys_get_temp_dir(), 'escpos') . ".png";
+	$cmd = sprintf("wkhtmltoimage -n -q --width %s %s %s",
+		escapeshellarg($width),
+		escapeshellarg($source),
+		escapeshellarg($dest));
+	
+	/* Run wkhtmltoimage */
+	ob_start();
+	system($cmd); // Can also use popen() for better control of process
+	$outp = ob_get_contents();
+	ob_end_clean();
+	if(!file_exists($dest)) {
+		throw new Exception("Command $cmd failed: $outp");
+	}
+
+	/* Load up the image */
+	try {
+		$img = new EscposImage($dest);
+	} catch(Exception $e) {
+		unlink($dest);
+		throw $e;
+	}
+	unlink($dest);
+
+	/* Print it */
+	$printer = new Escpos(); // Add connector for your printer here.
+	$printer -> bitImage($img); // bitImage() seems to allow larger images than graphics() on the TM-T20.
+	$printer -> cut();
+	$printer -> close();
+} catch(Exception $e) {
+	echo $e -> getMessage();
+}
+
diff --git a/htdocs/includes/escpos/example/print-from-pdf.php b/htdocs/includes/escpos/example/print-from-pdf.php
new file mode 100644
index 00000000000..ba6a4c67a96
--- /dev/null
+++ b/htdocs/includes/escpos/example/print-from-pdf.php
@@ -0,0 +1,71 @@
+<?php
+require_once(dirname(__FILE__) . '/../Escpos.php');
+/*
+ * This is three examples in one:
+ *  1: Print an entire PDF, normal quality.
+ *  2: Print at a lower quality for speed increase (CPU & transfer)
+ *  3: Cache rendered documents for a speed increase (removes CPU image processing completely on subsequent prints)
+ */
+
+/* 1: Print an entire PDF, start-to-finish (shorter form of the example) */
+$pdf = 'resources/document.pdf';
+try {
+	$pages = EscposImage::loadPdf($pdf);
+	$printer = new Escpos();
+	foreach($pages as $page) {
+		$printer -> graphics($page);
+	}
+	$printer -> cut();
+	$printer -> close();
+} catch(Exception $e) {
+	/* 
+	 * loadPdf() throws exceptions if files or not found, or you don't have the
+	 * imagick extension to read PDF's
+	 */
+	echo $e -> getMessage() . "\n";
+	exit(0);
+}
+
+
+/*
+ * 2: Speed up printing by roughly halving the resolution, and printing double-size.
+ * This gives a 75% speed increase at the expense of some quality.
+ * 
+ * Reduce the page width further if necessary: if it extends past the printing area, your prints will be very slow.
+ */
+$printer = new Escpos();
+$pdf = 'resources/document.pdf';
+$pages = EscposImage::loadPdf($pdf, 260);
+foreach($pages as $page) {
+	$printer -> graphics($page, Escpos::IMG_DOUBLE_HEIGHT | Escpos::IMG_DOUBLE_WIDTH);
+}
+$printer -> cut();
+$printer -> close();
+
+/*
+ * 3: PDF printing still too slow? If you regularly print the same files, serialize & compress your
+ * EscposImage objects (after printing[1]), instead of throwing them away.
+ * 
+ * (You can also do this to print logos on computers which don't have an
+ * image processing library, by preparing a serialized version of your logo on your PC)
+ * 
+ * [1]After printing, the pixels are loaded and formatted for the print command you used, so even a raspberry pi can print complex PDF's quickly.
+ */
+$printer = new Escpos();
+$pdf = 'resources/document.pdf';
+$ser = 'resources/document.z';
+if(!file_exists($ser)) {
+	$pages = EscposImage::loadPdf($pdf);
+} else {
+	$pages = unserialize(gzuncompress(file_get_contents($ser)));
+}
+
+foreach($pages as $page) {
+	$printer -> graphics($page);
+}
+$printer -> cut();
+$printer -> close();
+
+if(!file_exists($ser)) {
+	file_put_contents($ser, gzcompress(serialize($pages)));
+}
diff --git a/htdocs/includes/escpos/example/qr-code.php b/htdocs/includes/escpos/example/qr-code.php
new file mode 100644
index 00000000000..dbf21aaedf4
--- /dev/null
+++ b/htdocs/includes/escpos/example/qr-code.php
@@ -0,0 +1,81 @@
+<?php
+/* Demonstration of available options on the qrCode() command */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+$printer = new Escpos();
+
+// Most simple example
+title($printer, "QR code demo\n");
+$testStr = "Testing 123";
+$printer -> qrCode($testStr);
+$printer -> text("Most simple example\n");
+$printer -> feed();
+
+// Demo that alignment is the same as text
+$printer -> setJustification(Escpos::JUSTIFY_CENTER);
+$printer -> qrCode($testStr);
+$printer -> text("Same example, centred\n");
+$printer -> setJustification();
+$printer -> feed();
+	
+// Demo of numeric data being packed more densly
+title($printer, "Data encoding\n");
+$test = array(
+	"Numeric"      => "0123456789012345678901234567890123456789",
+	"Alphanumeric" => "abcdefghijklmnopqrstuvwxyzabcdefghijklmn",
+	"Binary"       => str_repeat("\0", 40));
+foreach($test as $type => $data) {
+	$printer -> qrCode($data);
+	$printer -> text("$type\n");
+	$printer -> feed();
+}
+
+// Demo of error correction
+title($printer, "Error correction\n");
+$ec = array(
+	Escpos::QR_ECLEVEL_L => "L",
+	Escpos::QR_ECLEVEL_M => "M",
+	Escpos::QR_ECLEVEL_Q => "Q",
+	Escpos::QR_ECLEVEL_H => "H");
+foreach($ec as $level => $name) {
+	$printer -> qrCode($testStr, $level);
+	$printer -> text("Error correction $name\n");
+	$printer -> feed();
+}
+
+// Change size
+title($printer, "Pixel size\n");
+$sizes = array(
+	1 => "(minimum)",
+	2 => "",
+	3 => "(default)",
+	4 => "",
+	5 => "",
+	10 => "",
+	16 => "(maximum)");
+foreach($sizes as $size => $label) {
+	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, $size);
+	$printer -> text("Pixel size $size $label\n");
+	$printer -> feed();
+}
+
+// Change model
+title($printer, "QR model\n");
+$models = array(
+	Escpos::QR_MODEL_1 => "QR Model 1",
+	Escpos::QR_MODEL_2 => "QR Model 2 (default)",
+	Escpos::QR_MICRO => "Micro QR code\n(not supported on all printers)");
+foreach($models as $model => $name) {
+	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, 3, $model);
+	$printer -> text("$name\n");
+	$printer -> feed();
+}
+
+// Cut & close
+$printer -> cut();
+$printer -> close();
+
+function title(Escpos $printer, $str) {
+	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH);
+	$printer -> text($str);
+	$printer -> selectPrintMode();
+}
diff --git a/htdocs/includes/escpos/example/receipt-with-logo.php b/htdocs/includes/escpos/example/receipt-with-logo.php
new file mode 100644
index 00000000000..8322c09c750
--- /dev/null
+++ b/htdocs/includes/escpos/example/receipt-with-logo.php
@@ -0,0 +1,96 @@
+<?php
+require_once(dirname(__FILE__) . "/../Escpos.php");
+
+/* Information for the receipt */
+$items = array(
+	new item("Example item #1", "4.00"),
+	new item("Another thing", "3.50"),
+	new item("Something else", "1.00"),
+	new item("A final item", "4.45"),
+);
+$subtotal = new item('Subtotal', '12.95');
+$tax = new item('A local tax', '1.30');
+$total = new item('Total', '14.25', true);
+/* Date is kept the same for testing */
+// $date = date('l jS \of F Y h:i:s A');
+$date = "Monday 6th of April 2015 02:56:25 PM";
+
+/* Start the printer */
+$logo = new EscposImage("resources/escpos-php.png");
+$printer = new Escpos();
+
+/* Print top logo */
+$printer -> setJustification(Escpos::JUSTIFY_CENTER);
+$printer -> graphics($logo);
+
+/* Name of shop */
+$printer -> selectPrintMode(Escpos::MODE_DOUBLE_WIDTH);
+$printer -> text("ExampleMart Ltd.\n");
+$printer -> selectPrintMode();
+$printer -> text("Shop No. 42.\n");
+$printer -> feed();
+
+/* Title of receipt */
+$printer -> setEmphasis(true);
+$printer -> text("SALES INVOICE\n");
+$printer -> setEmphasis(false);
+
+/* Items */
+$printer -> setJustification(Escpos::JUSTIFY_LEFT);
+$printer -> setEmphasis(true);
+$printer -> text(new item('', '$'));
+$printer -> setEmphasis(false);
+foreach($items as $item) {
+	$printer -> text($item);
+}
+$printer -> setEmphasis(true);
+$printer -> text($subtotal);
+$printer -> setEmphasis(false);
+$printer -> feed();
+
+/* Tax and total */
+$printer -> text($tax);
+$printer -> selectPrintMode(Escpos::MODE_DOUBLE_WIDTH);
+$printer -> text($total);
+$printer -> selectPrintMode();
+
+/* Footer */
+$printer -> feed(2);
+$printer -> setJustification(Escpos::JUSTIFY_CENTER);
+$printer -> text("Thank you for shopping at ExampleMart\n");
+$printer -> text("For trading hours, please visit example.com\n");
+$printer -> feed(2);
+$printer -> text($date . "\n");
+
+/* Cut the receipt and open the cash drawer */
+$printer -> cut();
+$printer -> pulse();
+
+$printer -> close();
+
+/* A wrapper to do organise item names & prices into columns */
+class item {
+	private $name;
+	private $price;
+	private $dollarSign;
+
+	public function __construct($name = '', $price = '', $dollarSign = false) {
+		$this -> name = $name;
+		$this -> price = $price;
+		$this -> dollarSign = $dollarSign;
+	}
+	
+	public function __toString() {
+		$rightCols = 10;
+		$leftCols = 38;
+		if($this -> dollarSign) {
+			$leftCols = $leftCols / 2 - $rightCols / 2;
+		}
+		$left = str_pad($this -> name, $leftCols) ;
+		
+		$sign = ($this -> dollarSign ? '$ ' : '');
+		$right = str_pad($sign . $this -> price, $rightCols, ' ', STR_PAD_LEFT);
+		return "$left$right\n";
+	}
+}
+?>
diff --git a/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc b/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
new file mode 100644
index 00000000000..caca76c4479
--- /dev/null
+++ b/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
@@ -0,0 +1,35 @@
+<?php
+/* All strings from EscposPrintBufferTest are included below- These are fully supported
+ * on the default profile, so you can use them to test modified profiles (using the wrong
+ * profile for a printer produces mojibake) */
+$inputsOk = array(
+		"Danish" => "Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.\n",
+		"German" => "Falsches Üben von Xylophonmusik quält jeden größeren Zwerg.\n",
+		"Greek" => "Ξεσκεπάζω την ψυχοφθόρα βδελυγμία\n",
+		"English" => "The quick brown fox jumps over the lazy dog.\n",
+		"Spanish" => "El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n",
+		"French" => "Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ.\n",
+		"Irish Gaelic" => "D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh.\n",
+		"Hungarian" => "Árvíztűrő tükörfúrógép.\n",
+		"Icelandic" => "Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa.\n",
+		"Latvian" => "Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus.\n",
+		"Polish" => "Pchnąć w tę łódź jeża lub ośm skrzyń fig.\n",
+		"Russian" => "В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!\n",
+		"Turkish" => "Pijamalı hasta, yağız şoföre çabucak güvendi.\n",
+		"Japanese (Katakana half-width)" => implode("\n", array("ｲﾛﾊﾆﾎﾍﾄ ﾁﾘﾇﾙｦ ﾜｶﾖﾀﾚｿ ﾂﾈﾅﾗﾑ",  "ｳｲﾉｵｸﾔﾏ ｹﾌｺｴﾃ ｱｻｷﾕﾒﾐｼ ｴﾋﾓｾｽﾝ")) . "\n"
+		);
+
+/*
+ * These strings are not expected to print correctly, if at all, even on an Epson printer. This is due to a mix of
+ * escpos driver, printer, and PHP language support issues.
+ * 
+ * They are included here as a collection of things not yet implemented.
+ */
+$inputsNotOk = array(
+		"Thai (No character encoder available)" => "นายสังฆภัณฑ์ เฮงพิทักษ์ฝั่ง ผู้เฒ่าซึ่งมีอาชีพเป็นฅนขายฃวด ถูกตำรวจปฏิบัติการจับฟ้องศาล ฐานลักนาฬิกาคุณหญิงฉัตรชฎา ฌานสมาธิ\n",
+		"Japanese (Hiragana)" => implode("\n", array("いろはにほへとちりぬるを",  " わかよたれそつねならむ", "うゐのおくやまけふこえて",  "あさきゆめみしゑひもせす")) . "\n",
+		"Japanese (Katakana full-width)" => implode("\n", array("イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム",  "ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン")) . "\n",
+		"Arabic (RTL not supported, encoding issues)" => "صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ" . "\n",
+		"Hebrew (RTL not supported, line break issues)" => "דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה" . "\n"
+		);
+
diff --git a/htdocs/includes/escpos/example/resources/document.odt b/htdocs/includes/escpos/example/resources/document.odt
new file mode 100644
index 0000000000000000000000000000000000000000..4bbd7f98b654dd1f8086589f22bfb9ed7ecb4c9a
GIT binary patch
literal 39751
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%0DXC4u*ZB5o$LxKAV8c6QUjWTfwW
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/resources/document.pdf b/htdocs/includes/escpos/example/resources/document.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..93a702337f1b09cfcb96ddce75a0c6421b69251e
GIT binary patch
literal 24389
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/resources/document.z b/htdocs/includes/escpos/example/resources/document.z
new file mode 100644
index 0000000000000000000000000000000000000000..cb0473875589c9505bfaa40eec9fb6bb930e59a6
GIT binary patch
literal 20320
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
RuDa7m%-5OL40^FJe*+_L<7)r_

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/resources/escpos-php-small.png b/htdocs/includes/escpos/example/resources/escpos-php-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c74d2d57a29e0398f706efd0e2f4531c036584a
GIT binary patch
literal 1941
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
bG%zbMF*-0X?$PJj00000NkvXXu0mjfgfCmX

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/resources/escpos-php.png b/htdocs/includes/escpos/example/resources/escpos-php.png
new file mode 100644
index 0000000000000000000000000000000000000000..feee2d71cc280655b1765f2689bbed8299ba394e
GIT binary patch
literal 7871
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/resources/tux.png b/htdocs/includes/escpos/example/resources/tux.png
new file mode 100644
index 0000000000000000000000000000000000000000..e32f8d945345480f7bdd85354b48bbd84dcb4f0e
GIT binary patch
literal 5198
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
IM6N<$g1R`El>h($

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php b/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
new file mode 100644
index 00000000000..72dc7c8f2ed
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
@@ -0,0 +1,21 @@
+<?php 
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+/* This example shows the printing of Latvian text on the Star TUP 592 printer */
+$profile = StarCapabilityProfile::getInstance();
+
+/* Option 1: Native character encoding */
+$connector = new FilePrintConnector("php://stdout");
+$printer = new Escpos($connector, $profile);
+$printer -> text("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus\n");
+$printer -> cut();
+$printer -> close();
+
+/* Option 2: Image-based output (formatting not available using this output) */
+$buffer = new ImagePrintBuffer();
+$connector = new FilePrintConnector("php://stdout");
+$printer = new Escpos($connector, $profile);
+$printer -> setPrintBuffer($buffer);
+$printer -> text("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus\n");
+$printer -> cut();
+$printer -> close();
+?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php b/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
new file mode 100644
index 00000000000..49eca235091
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
@@ -0,0 +1,36 @@
+<?php
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+/*
+ * This example shows how tok send a custom command to the printer-
+ * The use case here is an Epson TM-T20II and German text.
+ * 
+ * Background: Not all ESC/POS features are available in the driver, so sometimes
+ * you might want to send a custom commnad. This is useful for testing
+ * new features.
+ * 
+ * The Escpos::text() function removes non-printable characters as a precaution,
+ * so that commands cannot be injected into user input. To send raw data to
+ * the printer, you need to write bytes to the underlying PrintConnector.
+ * 
+ * If you get a new command working, please file an issue on GitHub with a code
+ * snippet so that it can be incorporated into escpos-php.
+ */
+
+/* Set up profile & connector */
+$connector = new FilePrintConnector("php://output");
+$profile = DefaultCapabilityProfile::getInstance(); // Works for Epson printers
+
+$printer = new Escpos($connector, $profile);
+$cmd = Escpos::ESC . "V" . chr(1); // Try out 90-degree rotation.
+$printer -> getPrintConnector() -> write($cmd);
+$printer -> text("Beispieltext in Deutsch\n");
+$printer -> cut();
+$printer -> close();
+
+/*
+ * Hex-dump of output confirms that ESC V 1 being sent:
+ *
+ * 0000000 033   @ 033   V 001   B   e   i   s   p   i   e   l   t   e   x
+ * 0000010   t       i   n       D   e   u   t   s   c   h  \n 035   V   A
+ * 0000020 003
+ */
\ No newline at end of file
diff --git a/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php b/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
new file mode 100644
index 00000000000..7314ad21bf0
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Example of printing Spanish text on SEYPOS PRP-300 thermal line printer.
+ * The characters in Spanish are available in code page 437, so no special
+ * code pages are needed in this case (SimpleCapabilityProfile).
+ *
+ * Use the hardware switch to activate "Two-byte Character Code"
+ */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+$connector = new FilePrintConnector("php://output");
+$profile = SimpleCapabilityProfile::getInstance();
+$printer = new Escpos($connector);
+$printer -> text("El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n");
+$printer -> cut();
+$printer -> close();
+
diff --git a/htdocs/includes/escpos/example/specific/39-currency-symbols.php b/htdocs/includes/escpos/example/specific/39-currency-symbols.php
new file mode 100644
index 00000000000..b3d4b29edd1
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/39-currency-symbols.php
@@ -0,0 +1,69 @@
+<?php 
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+$profile = DefaultCapabilityProfile::getInstance();
+// This is a quick demo of currency symbol issues in #39.
+
+/* Option 1: Native ESC/POS characters, depends on printer and is buggy. */
+$connector = new FilePrintConnector("php://stdout");
+$printer = new Escpos($connector, $profile);
+$printer -> text("€ 9,95\n");
+$printer -> text("£ 9.95\n");
+$printer -> text("$ 9.95\n");
+$printer -> text("¥ 9.95\n");
+$printer -> cut();
+$printer -> close();
+
+/* Option 2: Image-based output (formatting not available using this output). */
+$buffer = new ImagePrintBuffer();
+$connector = new FilePrintConnector("php://stdout");
+$printer = new Escpos($connector, $profile);
+$printer -> setPrintBuffer($buffer);
+$printer -> text("€ 9,95\n");
+$printer -> text("£ 9.95\n");
+$printer -> text("$ 9.95\n");
+$printer -> text("¥ 9.95\n");
+$printer -> cut();
+$printer -> close();
+
+/*
+ Option 3: If the printer is configured to print in a specific code
+ page, you can set up a CapabilityProfile which either references its
+ iconv encoding name, or includes all of the available characters.
+
+ Here, we make use of CP858 for its inclusion of currency symbols which
+ are not available in CP437. CP858 has good printer support, but is not
+ included in all iconv builds.
+*/
+class CustomCapabilityProfile extends SimpleCapabilityProfile {
+	function getCustomCodePages() {
+		/*
+		 * Example to print in a specific, user-defined character set
+		 * on a printer which has been configured to use i
+		 */
+		return array(
+		'CP858' => "ÇüéâäàåçêëèïîìÄÅ" .
+				"ÉæÆôöòûùÿÖÜø£Ø׃" .
+				"áíóúñѪº¿®¬½¼¡«»" .
+				"░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐" .
+				"└┴┬├─┼ãÃ╚╔╩╦╠═╬¤" .
+				"ðÐÊËÈ€ÍÎÏ┘┌█▄¦Ì▀" .
+				"ÓßÔÒõÕµþÞÚÛÙýݯ´" .
+				" ±‗¾¶§÷¸°¨·¹³²■ ");
+	}
+	
+	function getSupportedCodePages() {
+		return array(
+				0 => 'custom:CP858');
+	}
+}
+
+$connector = new FilePrintConnector("php://stdout");
+$profile = CustomCapabilityProfile::getInstance();
+$printer = new Escpos($connector, $profile);
+$printer -> text("€ 9,95\n");
+$printer -> text("£ 9.95\n");
+$printer -> text("$ 9.95\n");
+$printer -> text("¥ 9.95\n");
+
+$printer -> cut();
+$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php b/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
new file mode 100644
index 00000000000..4ef1a9575c2
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
@@ -0,0 +1,31 @@
+<?php
+/* Example of printing the GBP pound symbol on a STAR TSP650
+ * 
+ * In this example, it's shown how to check that your PHP files are actually being
+ * saved in unicode. Sections B) and C) are identical in UTF-8, but different
+ * if you are saving to a retro format like Windows-1252.
+ */
+
+// Adjust these to your environment
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+$connector = new FilePrintConnector("php://stdout");
+
+// Start printer
+$profile = SimpleCapabilityProfile::getInstance();
+$printer = new Escpos($connector, $profile);
+
+// A) Raw pound symbol
+// This is the most likely thing to work, and bypasses all the fancy stuff.
+$printer -> textRaw("\x9C"); // based on position in CP437
+$printer -> text(" 1.95\n");
+
+// B) Manually encoded UTF8 pound symbol. Tests that the driver correctly
+//		encodes this as CP437.
+$printer -> text(base64_decode("wqM=") . " 2.95\n");
+
+// C) Pasted in file. Tests that your files are being saved as UTF-8, which
+// 		escpos-php is able to convert automatically to a mix of code pages.
+$printer -> text("£ 3.95\n");
+
+$printer -> cut();
+$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/50-P-822D-greek.php b/htdocs/includes/escpos/example/specific/50-P-822D-greek.php
new file mode 100644
index 00000000000..2d88cf1a2a8
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/50-P-822D-greek.php
@@ -0,0 +1,16 @@
+<?php
+/* Example of Greek text on the P-822D */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+
+// Setup the printer
+$connector = new FilePrintConnector("php://stdout");
+$profile = P822DCapabilityProfile::getInstance();
+$printer = new Escpos($connector, $profile);
+
+// Print a Greek pangram
+$text = "Ξεσκεπάζω την ψυχοφθόρα βδελυγμία";
+$printer -> text($text . "\n");
+$printer -> cut();
+
+// Close the connection
+$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php b/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
new file mode 100644
index 00000000000..c2b0fb5aa57
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ * This example shows Arabic image-based output on the EPOS TEP 220m.
+ *
+ * Because escpos-php is not yet able to render Arabic correctly
+ * on thermal line printers, small images are generated and sent
+ * instead. This is a bit slower, and only limited formatting
+ * is currently available in this mode.
+ * 
+ * Requirements are:
+ *  - imagick extension (For the ImagePrintBuffer, which does not
+ *      support gd at the time of writing)
+ *  - Ar-PHP library, available from sourceforge, for the first
+ *      part of this example. Drop it in the folder listed below:
+ */
+require_once(dirname(__FILE__) . "/../../Escpos.php");
+require_once(dirname(__FILE__) . "/../../vendor/I18N/Arabic.php");
+
+/*
+ * First, convert the text into LTR byte order with joined letters,
+ * Using the Ar-PHP library.
+ * 
+ * The Ar-PHP library uses the default internal encoding, and can print
+ * a lot of errors depending on the input, so be prepared to debug
+ * the next four lines.
+ * 
+ * Note that this output shows that numerals are converted to placeholder
+ * characters, indicating that western numerals (123) have to be used instead.
+ */
+mb_internal_encoding("UTF-8");
+$Arabic = new I18N_Arabic('Glyphs');
+$text = "صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ";
+$text = $Arabic -> utf8Glyphs($text);
+
+/*
+ * Set up and use the printer
+ */
+$buffer = new ImagePrintBuffer();
+$profile = EposTepCapabilityProfile::getInstance();
+$connector = new FilePrintConnector("php://output");
+		// = WindowsPrintConnector("LPT2");
+		// Windows LPT2 was used in the bug tracker
+
+$printer = new Escpos($connector, $profile);
+$printer -> setPrintBuffer($buffer);
+$printer -> text($text . "\n");
+$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/README.md b/htdocs/includes/escpos/example/specific/README.md
new file mode 100644
index 00000000000..7433e7aa247
--- /dev/null
+++ b/htdocs/includes/escpos/example/specific/README.md
@@ -0,0 +1,7 @@
+Specific examples
+-----------------
+
+These examples are designed for specific combinations of language,
+printer and interface.
+
+They are documented here because the general examples all set up the printer in a similar way.
diff --git a/htdocs/includes/escpos/example/text-size.php b/htdocs/includes/escpos/example/text-size.php
new file mode 100644
index 00000000000..2f9272e434b
--- /dev/null
+++ b/htdocs/includes/escpos/example/text-size.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * This print-out shows how large the available font sizes are. It is included
+ * separately due to the amount of text it prints.
+ *
+ * @author Michael Billington <michael.billington@gmail.com>
+ */
+require_once(dirname(__FILE__) . "/../Escpos.php");
+$printer = new Escpos();
+
+/* Initialize */
+$printer -> initialize();
+
+/* Text of various (in-proportion) sizes */
+title($printer, "Change height & width\n");
+for($i = 1; $i <= 8; $i++) {
+	$printer -> setTextSize($i, $i);
+	$printer -> text($i);
+}
+$printer -> text("\n");
+
+/* Width changing only */
+title($printer, "Change width only (height=4):\n");
+for($i = 1; $i <= 8; $i++) {
+	$printer -> setTextSize($i, 4);
+	$printer -> text($i);
+}
+$printer -> text("\n");
+
+/* Height changing only */
+title($printer, "Change height only (width=4):\n");
+for($i = 1; $i <= 8; $i++) {
+	$printer -> setTextSize(4, $i);
+	$printer -> text($i);
+}
+$printer -> text("\n");
+
+/* Very narrow text */
+title($printer, "Very narrow text:\n");
+$printer -> setTextSize(1, 8);
+$printer -> text("The quick brown fox jumps over the lazy dog.\n");
+
+/* Very flat text */
+title($printer, "Very wide text:\n");
+$printer -> setTextSize(4, 1);
+$printer -> text("Hello world!\n");
+
+/* Very large text */
+title($printer, "Largest possible text:\n");
+$printer -> setTextSize(8,8);
+$printer -> text("Hello\nworld!\n");
+
+$printer -> cut();
+$printer -> close();
+
+function title(Escpos $printer, $text) {
+	$printer -> selectPrintMode(Escpos::MODE_EMPHASIZED);
+	$printer -> text("\n" . $text);
+	$printer -> selectPrintMode(); // Reset
+}
+
+?>
diff --git a/htdocs/includes/escpos/src/AbstractCapabilityProfile.php b/htdocs/includes/escpos/src/AbstractCapabilityProfile.php
new file mode 100644
index 00000000000..db2e8e01f58
--- /dev/null
+++ b/htdocs/includes/escpos/src/AbstractCapabilityProfile.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Not all printers support the same subset of available Esc/POS commands. Profiles allow you to specify
+ * which features are available on your printer, so that Escpos is less likely to send unsupported commands.
+ */
+abstract class AbstractCapabilityProfile {
+	/**
+	 * Sub-classes must be retrieved via getInstance(), so that validation
+	 * can be attached to guarantee that dud profiles are not used on an Escpos object.
+	 */
+	protected final function __construct() {
+		// This space intentionally left blank.
+	}
+
+	/**
+	 * If getSupportedCodePages contains custom code pages, their character maps must be provided here.
+	 */
+	abstract function getCustomCodePages();
+
+	/**
+	 * Return a map of code page numbers to names for this printer. Names
+	 * should match iconv code page names where possible (non-matching names will not be used).
+	 */
+	abstract function getSupportedCodePages();
+
+	/**
+	 * True to support barcode "function b", false to use only function A.
+	 */
+	abstract function getSupportsBarcodeB();
+
+	/**
+	 * True for bitImage support, false for no bitImage support.
+	 */
+	abstract function getSupportsBitImage();
+
+	/**
+	 * True for graphics support, false for no graphics support.
+	 */
+	abstract function getSupportsGraphics();
+
+	/**
+	 * True for 'STAR original' commands, false for standard ESC/POS only.
+	 */
+	abstract function getSupportsStarCommands();
+
+	/**
+	 * True if the printer renders its own QR codes, false to send an image.
+	 */
+	abstract function getSupportsQrCode();
+
+	/**
+	 * @return AbstractCapabilityProfile Instance of sub-class.
+	 */
+	public static final function getInstance() {
+		static $profile = null;
+		if ($profile === null) {
+			$profile = new static();
+		}
+		return $profile;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/CodePage.php b/htdocs/includes/escpos/src/CodePage.php
new file mode 100644
index 00000000000..15dcee657fc
--- /dev/null
+++ b/htdocs/includes/escpos/src/CodePage.php
@@ -0,0 +1,181 @@
+<?php
+abstract class CodePage {
+	/** Code page constants, exported from iconv -l. Can be cut down*/
+	const CP037 = "CP037";
+	const CP038 = "CP038";
+	const CP273 = "CP273";
+	const CP274 = "CP274";
+	const CP275 = "CP275";
+	const CP278 = "CP278";
+	const CP280 = "CP280";
+	const CP281 = "CP281";
+	const CP282 = "CP282";
+	const CP284 = "CP284";
+	const CP285 = "CP285";
+	const CP290 = "CP290";
+	const CP297 = "CP297";
+	const CP367 = "CP367";
+	const CP420 = "CP420";
+	const CP423 = "CP423";
+	const CP424 = "CP424";
+	const CP437 = "CP437";
+	const CP500 = "CP500";
+	const CP737 = "CP737";
+	const CP770 = "CP770";
+	const CP771 = "CP771";
+	const CP772 = "CP772";
+	const CP773 = "CP773";
+	const CP774 = "CP774";
+	const CP775 = "CP775";
+	const CP803 = "CP803";
+	const CP813 = "CP813";
+	const CP819 = "CP819";
+	const CP850 = "CP850";
+	const CP851 = "CP851";
+	const CP852 = "CP852";
+	const CP855 = "CP855";
+	const CP856 = "CP856";
+	const CP857 = "CP857";
+	const CP860 = "CP860";
+	const CP861 = "CP861";
+	const CP862 = "CP862";
+	const CP863 = "CP863";
+	const CP864 = "CP864";
+	const CP865 = "CP865";
+	const CP866 = "CP866";
+	const CP866NAV = "CP866NAV";
+	const CP868 = "CP868";
+	const CP869 = "CP869";
+	const CP870 = "CP870";
+	const CP871 = "CP871";
+	const CP874 = "CP874";
+	const CP875 = "CP875";
+	const CP880 = "CP880";
+	const CP891 = "CP891";
+	const CP901 = "CP901";
+	const CP902 = "CP902";
+	const CP903 = "CP903";
+	const CP904 = "CP904";
+	const CP905 = "CP905";
+	const CP912 = "CP912";
+	const CP915 = "CP915";
+	const CP916 = "CP916";
+	const CP918 = "CP918";
+	const CP920 = "CP920";
+	const CP921 = "CP921";
+	const CP922 = "CP922";
+	const CP930 = "CP930";
+	const CP932 = "CP932";//
+	const CP933 = "CP933";
+	const CP935 = "CP935";
+	const CP936 = "CP936";
+	const CP937 = "CP937";
+	const CP939 = "CP939";
+	const CP949 = "CP949";
+	const CP950 = "CP950";
+	const CP1004 = "CP1004";
+	const CP1008 = "CP1008";
+	const CP1025 = "CP1025";
+	const CP1026 = "CP1026";
+	const CP1046 = "CP1046";
+	const CP1047 = "CP1047";
+	const CP1070 = "CP1070";
+	const CP1079 = "CP1079";
+	const CP1081 = "CP1081";
+	const CP1084 = "CP1084";
+	const CP1089 = "CP1089";
+	const CP1097 = "CP1097";
+	const CP1112 = "CP1112";
+	const CP1122 = "CP1122";
+	const CP1123 = "CP1123";
+	const CP1124 = "CP1124";
+	const CP1125 = "CP1125";
+	const CP1129 = "CP1129";
+	const CP1130 = "CP1130";
+	const CP1132 = "CP1132";
+	const CP1133 = "CP1133";
+	const CP1137 = "CP1137";
+	const CP1140 = "CP1140";
+	const CP1141 = "CP1141";
+	const CP1142 = "CP1142";
+	const CP1143 = "CP1143";
+	const CP1144 = "CP1144";
+	const CP1145 = "CP1145";
+	const CP1146 = "CP1146";
+	const CP1147 = "CP1147";
+	const CP1148 = "CP1148";
+	const CP1149 = "CP1149";
+	const CP1153 = "CP1153";
+	const CP1154 = "CP1154";
+	const CP1155 = "CP1155";
+	const CP1156 = "CP1156";
+	const CP1157 = "CP1157";
+	const CP1158 = "CP1158";
+	const CP1160 = "CP1160";
+	const CP1161 = "CP1161";
+	const CP1162 = "CP1162";
+	const CP1163 = "CP1163";
+	const CP1164 = "CP1164";
+	const CP1166 = "CP1166";
+	const CP1167 = "CP1167";
+	const CP1250 = "CP1250";
+	const CP1251 = "CP1251";
+	const CP1252 = "CP1252";
+	const CP1253 = "CP1253";
+	const CP1254 = "CP1254";
+	const CP1255 = "CP1255";
+	const CP1256 = "CP1256";
+	const CP1257 = "CP1257";
+	const CP1258 = "CP1258";
+	const CP1282 = "CP1282";
+	const CP1361 = "CP1361";
+	const CP1364 = "CP1364";
+	const CP1371 = "CP1371";
+	const CP1388 = "CP1388";
+	const CP1390 = "CP1390";
+	const CP1399 = "CP1399";
+	const CP4517 = "CP4517";
+	const CP4899 = "CP4899";
+	const CP4909 = "CP4909";
+	const CP4971 = "CP4971";
+	const CP5347 = "CP5347";
+	const CP9030 = "CP9030";
+	const CP9066 = "CP9066";
+	const CP9448 = "CP9448";
+	const CP10007 = "CP10007";
+	const CP12712 = "CP12712";
+	const CP16804 = "CP16804";
+	const ISO8859_7 = "ISO_8859-7";
+	const ISO8859_2 = "ISO_8859-2";
+	const ISO8859_15 = "ISO_8859-15";
+	const RK1048 = "RK1048";
+	// Code pages which are not built in
+	// to default iconv on Debian.
+	const CP720 = false;
+	const CP853 = false;
+	const CP858 = false;
+	const CP928 = false;
+	const CP1098 = false;
+	const CP747 = false;
+	
+	/*
+	 * Below code pages appear to be vendor-specific (Star), so iconv wont use them
+	 * They are being merged gradually into the StarCapabilityProfile.
+	 */
+	const CP3840 = false;
+	const CP3841 = false;
+	const CP3843 = false;
+	const CP3844 = false;
+	const CP3845 = false;
+	const CP3847 = false;
+	const CP3846 = false;
+	const CP3848 = false;
+	const CP1001 = false;
+	const CP2001 = false;	
+	const CP3001 = false;
+	const CP3002 = false;
+	const CP3011 = false;
+	const CP3012 = false;
+	const CP3021 = false;
+	const CP3041 = false;
+}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/DefaultCapabilityProfile.php b/htdocs/includes/escpos/src/DefaultCapabilityProfile.php
new file mode 100644
index 00000000000..4275d03bde8
--- /dev/null
+++ b/htdocs/includes/escpos/src/DefaultCapabilityProfile.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * This capability profile matches many recent Epson-branded thermal receipt printers.
+ * 
+ * For non-Epson printers, try the SimpleCapabilityProfile.
+ */
+class DefaultCapabilityProfile extends AbstractCapabilityProfile {
+	function getCustomCodePages() {
+		return array();
+	}
+
+	function getSupportedCodePages() {
+		/* Character code tables which the printer understands, mapping to known encoding standards we may be able to encode to.
+		 * 
+		 * See CodePage.php for the mapping of these standards to encoding names for use in the backing library.
+		 * 
+		 * Any entry with 'false' means I haven't compared the print-out of the code page to a table.
+		 */
+		return array(
+			0 => CodePage::CP437,
+			1 => CodePage::CP932,
+			2 => CodePage::CP850,
+			3 => CodePage::CP860,
+			4 => CodePage::CP863,
+			5 => CodePage::CP865,
+			6 => false, // Hiragana
+			7 => false, // One-pass printing Kanji characters
+			8 => false, // Page 8 [One-pass printing Kanji characters]
+			11 => CodePage::CP851,
+			12 => CodePage::CP853,
+			13 => CodePage::CP857,
+			14 => CodePage::CP737,
+			15 => CodePage::ISO8859_7,
+			16 => CodePage::CP1252,
+			17 => CodePage::CP866,
+			18 => CodePage::CP852,
+			19 => CodePage::CP858,
+			20 => false, // Thai Character Code 42
+			21 => CodePage::CP874, // Thai Character Code 11
+			22 => false, // Thai Character Code 13
+			23 => false, // Thai Character Code 14
+			24 => false, // Thai Character Code 16
+			25 => false, // Thai Character Code 17
+			26 => false, // Thai Character Code 18
+			30 => false, // TCVN-3: Vietnamese
+			31 => false, // TCVN-3: Vietnamese
+			32 => CodePage::CP720,
+			33 => CodePage::CP775,
+			34 => CodePage::CP855,
+			35 => CodePage::CP861,
+			36 => CodePage::CP862,
+			37 => CodePage::CP864,
+			38 => CodePage::CP869,
+			39 => CodePage::ISO8859_2,
+			40 => CodePage::ISO8859_15,
+			41 => CodePage::CP1098, // PC1098: Farsi
+			42 => CodePage::CP774,
+			43 => CodePage::CP772,
+			44 => CodePage::CP1125,
+			45 => CodePage::CP1250,
+			46 => CodePage::CP1251,
+			47 => CodePage::CP1253,
+			48 => CodePage::CP1254,
+			49 => CodePage::CP1255,
+			50 => CodePage::CP1256,
+			51 => CodePage::CP1257,
+			52 => CodePage::CP1258,
+			53 => CodePage::RK1048,
+			66 => false, // Devanagari
+			67 => false, // Bengali
+			68 => false, // Tamil
+			69 => false, // Telugu
+			70 => false, // Assamese
+			71 => false, // Oriya
+			72 => false, // Kannada
+			73 => false, // Malayalam
+			74 => false, // Gujarati
+			75 => false, // Punjabi
+			82 => false, // Marathi
+			254 => false,
+			255 => false);
+	}
+
+	function getSupportsBarcodeB() {
+		return true;
+	}
+	
+	function getSupportsBitImage() {
+		return true;
+	}
+
+	function getSupportsGraphics() {
+		return true;
+	}
+
+	function getSupportsStarCommands() {
+		return false;
+	}
+
+	function getSupportsQrCode() {
+		return true;
+	}
+}
diff --git a/htdocs/includes/escpos/src/DummyPrintConnector.php b/htdocs/includes/escpos/src/DummyPrintConnector.php
new file mode 100644
index 00000000000..e1a197b7c7b
--- /dev/null
+++ b/htdocs/includes/escpos/src/DummyPrintConnector.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ * 
+ * Print connector that writes to nowhere, but allows the user to retrieve the
+ * buffered data. Used for testing.
+ */
+final class DummyPrintConnector implements PrintConnector {
+	/**
+	 * @var array Buffer of accumilated data.
+	 */
+	private $buffer;
+
+	/**
+	 * @var string data which the printer will provide on next read
+	 */
+	private $readData;
+
+	/**
+	 * Create new print connector
+	 */
+	public function __construct() {
+		$this -> buffer = array();
+	}
+
+	public function __destruct() {
+		if($this -> buffer !== null) {
+			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
+		}
+	}
+
+	public function finalize() {
+		$this -> buffer = null;
+	}
+
+	/**
+	 * @return string Get the accumulated data that has been sent to this buffer.
+	 */
+	public function getData() {
+		return implode($this -> buffer);
+	}
+
+	/* (non-PHPdoc)
+	 * @see PrintConnector::read()
+	 */
+	public function read($len) {
+		return $len >= strlen($this -> readData) ? $this -> readData : substr($this -> readData, 0, $len);
+	}
+
+	public function write($data) {
+		$this -> buffer[] = $data;
+	}
+}
diff --git a/htdocs/includes/escpos/src/EposTepCapabilityProfile.php b/htdocs/includes/escpos/src/EposTepCapabilityProfile.php
new file mode 100644
index 00000000000..2803fe3f69c
--- /dev/null
+++ b/htdocs/includes/escpos/src/EposTepCapabilityProfile.php
@@ -0,0 +1,4 @@
+<?php
+class EposTepCapabilityProfile extends DefaultCapabilityProfile {
+	// TODO override list of code pages
+}
diff --git a/htdocs/includes/escpos/src/EscposImage.php b/htdocs/includes/escpos/src/EscposImage.php
new file mode 100644
index 00000000000..76fb614715c
--- /dev/null
+++ b/htdocs/includes/escpos/src/EscposImage.php
@@ -0,0 +1,405 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ * 
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ * 
+ * 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.
+ * 
+ * This class deals with images in raster formats, and converts them into formats
+ * which are suitable for use on thermal receipt printers. Currently, only PNG
+ * images (in) and ESC/POS raster format (out) are implemeted.
+ * 
+ * Input formats:
+ *  - Currently, only PNG is supported.
+ *  - Other easily read raster formats (jpg, gif) will be added at a later date, as this is not complex.
+ *  - The BMP format can be directly read by some commands, but this has not yet been implemented.
+ *  
+ * Output formats:
+ *  - Currently, only ESC/POS raster format is supported
+ *  - ESC/POS 'column format' support is partially implemented, but is not yet used by Escpos.php library.
+ *  - Output as multiple rows of column format image is not yet in the works.
+ *  
+ * Libraries:
+ *  - Currently, php-gd is used to read the input. Support for imagemagick where gd is not installed is
+ *    also not complex to add, and is a likely future feature.
+ *  - Support for native use of the BMP format is a goal, for maximum compatibility with target environments. 
+ */
+class EscposImage {
+	/**
+	 * @var string The image's bitmap data (if it is a Windows BMP).
+	 */
+	protected $imgBmpData;
+	
+	/**
+	 * @var string image data in rows: 1 for black, 0 for white.
+	 */
+	protected $imgData;
+	
+	/**
+	 * @var string cached raster format data to avoid re-computation
+	 */
+	protected $imgRasterData;
+	
+	/**
+	 * @var int height of the image
+	 */
+	protected $imgHeight;
+
+	/**
+	 * @var int width of the image
+	 */
+	protected $imgWidth;
+	
+	/**
+	 * Load up an image from a filename
+	 * 
+	 * @param string $imgPath The path to the image to load, or null to skip
+	 * 			loading the image (some other functions are available for
+	 * 			populating the data). Supported graphics types depend on your PHP configuration.
+	 */
+	public function __construct($imgPath = null) {
+		/* Can't use bitmaps yet */
+		$this -> imgBmpData = null;
+		$this -> imgRasterData = null;
+		if($imgPath === null) {
+			// Blank image
+			$this -> imgHeight = 0;
+			$this -> imgWidth = 0;
+			$this -> imgData = "";
+			return;
+		}
+
+		/* Load up using GD */
+		if(!file_exists($imgPath)) {
+			throw new Exception("File '$imgPath' does not exist.");
+		}
+		$ext = pathinfo($imgPath, PATHINFO_EXTENSION);
+		if($ext == "bmp") {
+			// The plan is to implement BMP handling directly in
+			// PHP, as some printers understand this format themselves.
+			// TODO implement PHP bitmap handling
+			throw new Exception("Native bitmaps not yet supported. Please convert the file to a supported raster format.");
+		}
+		if($this -> isGdSupported()) {
+			// Prefer to use gd. It is installed by default, so
+			// most systems will have it, giving a consistent UX.
+			switch($ext) {
+				case "png":
+					$im = @imagecreatefrompng($imgPath);
+					$this -> readImageFromGdResource($im);
+					return;
+				case "jpg":
+					$im = @imagecreatefromjpeg($imgPath);
+					$this -> readImageFromGdResource($im);
+					return;
+				case "gif":
+					$im = @imagecreatefromgif($imgPath);
+					$this -> readImageFromGdResource($im);
+					return;
+			}
+		}
+		if($this -> isImagickSupported()) {
+			$im = new Imagick();
+			try {
+				// Throws an ImagickException if the format is not supported or file is not found
+				$im -> readImage($imgPath);
+			} catch(ImagickException $e) {
+				// Wrap in normal exception, so that classes which call this do not themselves require imagick as a dependency.
+				throw new Exception($e);
+			}
+			/* Flatten by doing a composite over white, in case of transparency */
+			$flat = new Imagick();
+			$flat -> newImage($im -> getimagewidth(), $im -> getimageheight(), "white");
+			$flat -> compositeimage($im, Imagick::COMPOSITE_OVER, 0, 0);
+			$this -> readImageFromImagick($flat);
+			return;
+		}
+		throw new Exception("Images are not supported on your PHP. Please install either the gd or imagick extension.");
+	}
+
+	/**
+	 * @return int height of the image in pixels
+	 */
+	public function getHeight() {
+		return $this -> imgHeight;
+	}
+	
+	/**
+	 * @return int Number of bytes to represent a row of this image
+	 */
+	public function getHeightBytes() {
+		return (int)(($this -> imgHeight + 7) / 8);
+	}
+	
+	/**
+	 * @return int Width of the image
+	 */
+	public function getWidth() {
+		return $this -> imgWidth;
+	}
+	
+	/**
+	 * @return int Number of bytes to represent a row of this image
+	 */
+	public function getWidthBytes() {
+		return (int)(($this -> imgWidth + 7) / 8);
+	}
+	
+	/**
+	 * @return string binary data of the original file, for function which accept bitmaps.
+	 */
+	public function getWindowsBMPData() {
+		return $this -> imgBmpData;
+	}
+	
+	/**
+	 * @return boolean True if the image was a windows bitmap, false otherwise
+	 */
+	public function isWindowsBMP() {
+		return $this -> imgBmpData != null;
+	}
+
+	/**
+	 * Load actual image pixels from GD resource.
+	 *
+	 * @param resouce $im GD resource to use
+	 * @throws Exception Where the image can't be read.
+	 */
+	public function readImageFromGdResource($im) {
+		if(!is_resource($im)) {
+			throw new Exception("Failed to load image.");
+		} else if(!$this -> isGdSupported()) {
+			throw new Exception(__FUNCTION__ . " requires 'gd' extension.");
+		}
+		/* Make a string of 1's and 0's */
+		$this -> imgHeight = imagesy($im);
+		$this -> imgWidth = imagesx($im);
+		$this -> imgData = str_repeat("\0", $this -> imgHeight * $this -> imgWidth);
+		for($y = 0; $y < $this -> imgHeight; $y++) {
+			for($x = 0; $x < $this -> imgWidth; $x++) {
+				/* Faster to average channels, blend alpha and negate the image here than via filters (tested!) */
+				$cols = imagecolorsforindex($im, imagecolorat($im, $x, $y));
+				$greyness = (int)(($cols['red'] + $cols['green'] + $cols['blue']) / 3) >> 7; // 1 for white, 0 for black
+				$black = (1 - $greyness) >> ($cols['alpha'] >> 6); // 1 for black, 0 for white, taking into account transparency
+				$this -> imgData[$y * $this -> imgWidth + $x] = $black;
+			}
+		}
+	}
+
+	/**
+	 * Load actual image pixels from Imagick object
+	 * 
+	 * @param Imagick $im Image to load from
+	 */
+	public function readImageFromImagick(Imagick $im) {
+		/* Threshold */
+		$im -> setImageType(Imagick::IMGTYPE_TRUECOLOR); // Remove transparency (good for PDF's)
+		$max = $im->getQuantumRange();
+		$max = $max["quantumRangeLong"];
+		$im -> thresholdImage(0.5 * $max);
+		/* Make a string of 1's and 0's */
+		$geometry = $im -> getimagegeometry();
+		$this -> imgHeight = $im -> getimageheight();
+		$this -> imgWidth = $im -> getimagewidth();
+		$this -> imgData = str_repeat("\0", $this -> imgHeight * $this -> imgWidth);
+
+		for($y = 0; $y < $this -> imgHeight; $y++) {
+			for($x = 0; $x < $this -> imgWidth; $x++) {
+				/* Faster to average channels, blend alpha and negate the image here than via filters (tested!) */
+				$cols = $im -> getImagePixelColor($x, $y);
+				$cols = $cols -> getcolor();
+				$greyness = (int)(($cols['r'] + $cols['g'] + $cols['b']) / 3) >> 7;  // 1 for white, 0 for black
+				$this -> imgData[$y * $this -> imgWidth + $x] = (1 - $greyness); // 1 for black, 0 for white
+			}
+		}
+
+	}
+	
+	/**
+	 * Output the image in raster (row) format. This can result in padding on the right of the image, if its width is not divisible by 8.
+	 * 
+	 * @throws Exception Where the generated data is unsuitable for the printer (indicates a bug or oversized image).
+	 * @return string The image in raster format.
+	 */
+	public function toRasterFormat() {
+		if($this -> imgRasterData != null) {
+			/* Use previous calculation */
+			return $this -> imgRasterData;
+		}
+		/* Loop through and convert format */
+		$widthPixels = $this -> getWidth();
+		$heightPixels = $this -> getHeight();
+		$widthBytes = $this -> getWidthBytes();
+		$heightBytes = $this -> getHeightBytes();
+		$x = $y = $bit = $byte = $byteVal = 0;
+		$data = str_repeat("\0", $widthBytes * $heightPixels);
+		if(strlen($data) == 0) {
+			return $data;
+		}
+		do {
+			$byteVal |= (int)$this -> imgData[$y * $widthPixels + $x] << (7 - $bit);
+			$x++;
+			$bit++;
+			if($x >= $widthPixels) {
+				$x = 0;
+				$y++;
+				$bit = 8;
+				if($y >= $heightPixels) {
+					$data[$byte] = chr($byteVal);
+					break;
+				}
+			}
+			if($bit >= 8) {
+				$data[$byte] = chr($byteVal);
+				$byteVal = 0;
+				$bit = 0;
+				$byte++;
+			}
+		} while(true);
+ 		if(strlen($data) != ($this -> getWidthBytes() * $this -> getHeight())) {
+ 			throw new Exception("Bug in " . __FUNCTION__ . ", wrong number of bytes.");
+ 		}
+ 		$this -> imgRasterData = $data;
+ 		return $this -> imgRasterData;
+	}
+	
+	/**
+	 * Output image in column format. This format results in padding at the base and right of the image, if its height and width are not divisible by 8.
+	 */
+	private function toColumnFormat() {
+		/* Note: This function is marked private, as it is not yet used/tested and may be buggy. */
+		$widthPixels = $this -> getWidth();
+		$heightPixels = $this -> getHeight();
+		$widthBytes = $this -> getWidthBytes();
+		$heightBytes = $this -> getHeightBytes();
+		$x = $y = $bit = $byte = $byteVal = 0;
+		$data = str_repeat("\0", $widthBytes * $heightBytes * 8);
+ 		do {
+ 			$byteVal |= (int)$this -> imgData[$y * $widthPixels + $x] << (8 - $bit);
+ 			$y++;
+ 			$bit++;
+ 			if($y >= $heightPixels) {
+ 				$y = 0;
+ 				$x++;
+ 				$bit = 8;
+ 				if($x >= $widthPixels) {
+ 					$data[$byte] = chr($byteVal);
+ 					break;
+ 				}
+ 			}
+ 			if($bit >= 8) {
+ 				$data[$byte] = chr($byteVal);
+ 				$byteVal = 0;
+ 				$bit = 0;
+ 				$byte++;
+ 			}
+ 		} while(true);
+  		if(strlen($data) != ($widthBytes * $heightBytes * 8)) {
+  			throw new Exception("Bug in " . __FUNCTION__ . ", wrong number of bytes. Should be " . ($widthBytes * $heightBytes * 8) . " but was " . strlen($data));
+  		}
+		return $data;
+	}
+	
+	/**
+	 * @return boolean True if GD is supported, false otherwise (a wrapper for the static version, for mocking in tests)
+	 */
+	protected function isGdSupported() {
+		return self::isGdLoaded();
+	}
+	
+	/**
+	 * @return boolean True if Imagick is supported, false otherwise (a wrapper for the static version, for mocking in tests)
+	 */
+	protected function isImagickSupported() {
+		return self::isImagickLoaded();
+	}
+	
+	
+	/**
+	 * @return boolean True if GD is loaded, false otherwise
+	 */
+	public static function isGdLoaded() {
+		return extension_loaded('gd');
+	}
+	
+	/**
+	 * @return boolean True if Imagick is loaded, false otherwise
+	 */
+	public static function isImagickLoaded() {
+		return extension_loaded('imagick');
+	}
+	
+	/**
+	 * Load a PDF for use on the printer
+	 *
+	 * @param string $pdfFile The file to load
+	 * @param string $pageWidth The width, in pixels, of the printer's output. The first page of the PDF will be scaled to approximately fit in this area.
+	 * @param array $range array indicating the first and last page (starting from 0) to load. If not set, the entire document is loaded.
+	 * @throws Exception Where Imagick is not loaded, or where a missing file or invalid page number is requested.
+	 * @return multitype:EscposImage Array of images, retrieved from the PDF file.
+	 */
+	public static function loadPdf($pdfFile, $pageWidth = 550, array $range = null) {
+		if(!extension_loaded('imagick')) {
+			throw new Exception(__FUNCTION__ . " requires imagick extension.");
+		}
+		/*
+		 * Load first page at very low density (resolution), to figure out what
+		 * density to use to achieve $pageWidth
+		 */
+		try {
+			$image = new Imagick();
+			$testRes = 2; // Test resolution
+			$image -> setresolution($testRes, $testRes);
+			$image -> readimage($pdfFile."[0]");
+			$geo = $image -> getimagegeometry();
+			$image -> destroy();
+			$width = $geo['width'];
+			$newRes = $pageWidth / $width * $testRes;
+			/* Load actual document (can be very slow!) */
+			$rangeStr = ""; // Set to [0] [0-1] page range if $range is set
+			if($range != null) {
+				if(count($range) != 2 || !isset($range[0]) || !is_integer($range[0]) || !isset($range[1]) || !is_integer($range[1]) || $range[0] > $range[1]) {
+					throw new Exception("Invalid range. Must be two numbers in the array: The start and finish page indexes, starting from 0.");
+				}
+				$rangeStr = "[" .  ($range[0] == $range[1] ? $range[0] : implode($range, "-")) . "]";
+			}
+			$image -> setresolution($newRes, $newRes);
+			$image -> readImage($pdfFile."$rangeStr");
+			$pages = $image -> getNumberImages();
+			/* Convert images to Escpos objects */
+			$ret = array();
+			for($i = 0;$i < $pages; $i++) {
+				$image -> setIteratorIndex($i);
+				$ep = new EscposImage();
+				$ep -> readImageFromImagick($image);
+				$ret[] = $ep;
+			}
+			return $ret;
+		} catch(ImagickException $e) {
+			// Wrap in normal exception, so that classes which call this do not themselves require imagick as a dependency.
+			throw new Exception($e);
+		}
+	}
+}
diff --git a/htdocs/includes/escpos/src/EscposPrintBuffer.php b/htdocs/includes/escpos/src/EscposPrintBuffer.php
new file mode 100644
index 00000000000..703bc0a57c0
--- /dev/null
+++ b/htdocs/includes/escpos/src/EscposPrintBuffer.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ * 
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ * 
+ * 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.
+ * 
+ * This class manages newlines and character encoding for the target printer, and
+ * can be interchanged for an image-bassed buffer (ImagePrintBuffer) if you can't
+ * get it operating properly on your machine.
+ */
+class EscposPrintBuffer implements PrintBuffer {
+	/**
+	 * @var boolean True to cache output as .gz, false to leave un-compressed (useful for debugging)
+	 */
+	const COMPRESS_CACHE = true;
+
+	/**
+	 * @var string The input encoding of the buffer.
+	 */
+	const INPUT_ENCODING = "UTF-8";
+
+	/**
+	 * @var string Un-recorgnised characters will be replaced with this.
+	 */
+	const REPLACEMENT_CHAR = "?";
+
+	/**
+	 * This array Maps ESC/POS character tables to names iconv encodings
+	 */
+	private $available = null;
+
+	/**
+	 * @var array Maps of UTF-8 to code-pages
+	 */
+	private $encode = null;
+
+	/**
+	 * @var Escpos Printer for output
+	 */
+	private $printer;
+
+	/**
+	 * Empty print buffer.
+	 */
+	function __construct() {
+		$this -> printer = null;
+	}
+
+	public function flush() {
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+		// TODO Not yet implemented for this buffer: This indicates that the printer needs the current line to be ended.
+	}
+
+	public function getPrinter() {
+		return $this -> printer;
+	}
+
+	public function setPrinter(Escpos $printer = null) {
+		$this -> printer = $printer;
+		if($printer != null) {
+			$this -> loadAvailableCharacters();
+		}
+	}
+
+	public function writeText($text) {	
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+		if($text == null) {
+			return;
+		}
+		if(!mb_detect_encoding($text, self::INPUT_ENCODING, true)) {
+			// Assume that the user has already put non-UTF8 into the target encoding.
+			return $this -> writeTextRaw($text);
+		}
+		$i = 0;
+		$j = 0;
+		$len = mb_strlen($text, self::INPUT_ENCODING);
+		while($i < $len) {
+			$matching = true;
+			if(($encoding = $this -> identifyText(mb_substr($text, $i, 1, self::INPUT_ENCODING))) === false) {
+				// Un-encodeable text
+				$encoding = $this -> getPrinter() -> getCharacterTable();
+			}
+			$i++;
+			$j = 1;
+			do {
+				$char = mb_substr($text, $i, 1, self::INPUT_ENCODING);
+				$matching = !isset($this -> available[$char]) || isset($this -> available[$char][$encoding]);
+				if($matching) {
+					$i++;
+					$j++;
+				}
+			} while($matching && $i < $len);
+			$this -> writeTextUsingEncoding(mb_substr($text, $i - $j, $j, self::INPUT_ENCODING), $encoding);
+		}	
+	}
+
+	public function writeTextRaw($text) {
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+		if(strlen($text) == 0) {
+			return;
+		}
+		// Pass only printable characters
+		for($i = 0; $i < strlen($text); $i++) {
+			$c = substr($text, $i, 1);
+			if(!self::asciiCheck($c, true)) {
+				$text[$i] = self::REPLACEMENT_CHAR;
+			}
+		}
+		$this -> write($text);
+	}
+
+	/**
+	 * Return an encoding which we can start to use for outputting this text. Later parts of the text need not be included in the returned code page.
+	 * 
+	 * @param string $text Input text to check.
+	 * @return boolean|integer Code page number, or FALSE if the text is not printable on any supported encoding.
+	 */
+	private function identifyText($text) {
+		// TODO Replace this with an algorithm to choose the encoding which will encode the farthest into the string, to minimise code page changes.
+		$char = mb_substr($text, 0, 1, self::INPUT_ENCODING);
+		if(!isset($this -> available[$char])) {
+			/* Character not available anywhere */
+			return false;
+		}
+		foreach($this -> available[$char] as $encodingNo => $true) {
+			/* Return first code-page where it is available */
+			return $encodingNo;
+		}
+		return false;
+	}
+	
+	/**
+	 * Based on the printer's connector, compute (or load a cached copy of) maps of UTF character to unicode characters for later use.
+	 */
+	private function loadAvailableCharacters() {
+		$supportedCodePages = $this -> printer -> getPrinterCapabilityProfile() -> getSupportedCodePages();
+		$capabilityClassName = get_class($this -> printer -> getPrinterCapabilityProfile());
+		$cacheFile = dirname(__FILE__) . "/cache/Characters-" . $capabilityClassName . ".ser" . (self::COMPRESS_CACHE ? ".gz" : "");
+		$cacheKey = md5(serialize($supportedCodePages));
+		/* Check for pre-generated file */
+		if(file_exists($cacheFile)) {
+			$cacheData = file_get_contents($cacheFile);
+			if(self::COMPRESS_CACHE) {
+				$cacheData = gzdecode($cacheData);
+			}
+			if($cacheData) {
+				$dataArray = unserialize($cacheData);
+				if(isset($dataArray["key"]) && isset($dataArray["available"]) && isset($dataArray["encode"]) && $dataArray["key"] == $cacheKey) {
+					$this -> available = $dataArray["available"];
+					$this -> encode = $dataArray["encode"];
+					return;
+				}
+			}
+		}
+		/* Generate conversion tables */
+		$encode = array();
+		$available = array();
+		$custom = $this -> printer -> getPrinterCapabilityProfile() -> getCustomCodePages();
+		
+		foreach($supportedCodePages as $num => $characterMap) {
+			$encode[$num] = array();
+			if($characterMap === false) {
+				continue;
+			} else if(strpos($characterMap, ":") !== false) {
+				/* Load a pre-defined custom map (vendor-specific code pages) */
+				$i = strpos($characterMap, ":");
+				if(substr($characterMap, 0, $i) !== "custom") {
+					continue;
+				}
+				$i++;
+				$mapName = substr($characterMap, $i, strlen($characterMap) - $i);
+				if(!isset($custom[$mapName]) || mb_strlen($custom[$mapName], self::INPUT_ENCODING) != 128) {
+					throw new Exception("Capability profile referenced invalid custom map '$mapName'.");
+				}
+				$map = $custom[$mapName];
+				for($char = 128; $char <= 255; $char++) {
+					$utf8 = mb_substr($map, $char - 128, 1, self::INPUT_ENCODING);
+					if($utf8 == " ") { // Skip placeholders
+						continue;
+					}
+					if(!isset($available[$utf8])) {
+						$available[$utf8] = array();
+					}
+					$available[$utf8][$num] = true;
+					$encode[$num][$utf8] = chr($char);
+				}
+			} else {
+				/* Generate map using iconv */
+				for($char = 128; $char <= 255; $char++) {
+					$utf8 = @iconv($characterMap, self::INPUT_ENCODING, chr($char));
+					if($utf8 == '') {
+						continue;
+					}
+					if(iconv(self::INPUT_ENCODING, $characterMap, $utf8) != chr($char)) {
+						// Avoid non-canonical conversions
+						continue;
+					}
+					if(!isset($available[$utf8])) {
+						$available[$utf8] = array();
+					}
+					$available[$utf8][$num] = true;
+					$encode[$num][$utf8] = chr($char);
+				}
+			}
+		}
+		/* Use generated data */
+		$dataArray = array("available" => $available, "encode" => $encode, "key" => $cacheKey);
+		$this -> available = $dataArray["available"];
+		$this -> encode = $dataArray["encode"];
+		$cacheData = serialize($dataArray);
+		if(self::COMPRESS_CACHE) {
+			$cacheData = gzencode($cacheData);
+		}
+		/* Attempt to cache, but don't worry if we can't */
+		@file_put_contents($cacheFile, $cacheData);
+	}
+
+	/**
+	 * Encode a block of text using the specified map, and write it to the printer.
+	 * 
+	 * @param string $text Text to print, UTF-8 format.
+	 * @param integer $encodingNo Encoding number to use- assumed to exist.
+	 */
+	private function writeTextUsingEncoding($text, $encodingNo) {
+ 		$encodeMap = $this -> encode[$encodingNo];
+ 		$len = mb_strlen($text, self::INPUT_ENCODING);
+ 		$rawText = str_repeat(self::REPLACEMENT_CHAR, $len);
+ 		for($i = 0; $i < $len; $i++) {
+ 			$char = mb_substr($text, $i, 1, self::INPUT_ENCODING);
+ 			if(isset($encodeMap[$char])) {
+ 				$rawText[$i] = $encodeMap[$char];
+ 			} else if(self::asciiCheck($char)) {
+ 				$rawText[$i] = $char;
+ 			}
+ 		}
+ 		if($this -> printer -> getCharacterTable() != $encodingNo) {
+ 			$this -> printer -> selectCharacterTable($encodingNo);
+ 		}
+		$this -> writeTextRaw($rawText);
+	}
+
+	/**
+	 * Write data to the underlying printer.
+	 * 
+	 * @param string $data
+	 */
+	private function write($data) {
+		$this -> printer -> getPrintConnector() -> write($data);
+	}
+
+	/**
+	 * Return true if a character is an ASCII printable character.
+	 *
+	 * @param string $char Character to check
+	 * @param boolean $extended True to allow 128-256 values also (excluded by default)
+	 * @return boolean True if the character is printable, false if it is not.
+	 */
+	private static function asciiCheck($char, $extended = false) {
+		if(strlen($char) != 1) {
+			// Multi-byte string
+			return false;
+		}
+		$num = ord($char);
+		if($num > 31 && $num < 127) { // Printable
+			return true;
+		}
+		if($num == 10) { // New-line (printer will take these)
+			return true;
+		}
+		if($extended && $num > 127) {
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/htdocs/includes/escpos/src/FilePrintConnector.php b/htdocs/includes/escpos/src/FilePrintConnector.php
new file mode 100644
index 00000000000..8d87f0a527a
--- /dev/null
+++ b/htdocs/includes/escpos/src/FilePrintConnector.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ * 
+ * PrintConnector for passing print data to a file.
+ */
+class FilePrintConnector implements PrintConnector {
+	/**
+	 * @var resource The file pointer to send data to.
+	 */
+	protected $fp;
+
+	/**
+	 * Construct new connector, given a filename
+	 * 
+	 * @param string $filename
+	 */
+	public function __construct($filename) {
+		$this -> fp = fopen($filename, "wb+");
+		if($this -> fp === false) {
+			throw new Exception("Cannot initialise FilePrintConnector.");
+		}
+	}
+
+	public function __destruct() {
+		if($this -> fp !== false) {
+			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
+		}
+	}
+
+	/**
+	 * Close file pointer
+	 */
+	public function finalize() {
+		fclose($this -> fp);
+		$this -> fp = false;
+	}
+	
+	/* (non-PHPdoc)
+	 * @see PrintConnector::read()
+	 */
+	public function read($len) {
+		rewind($this -> fp);
+		return fgets($this -> fp, $len + 1);
+	}
+	
+	/**
+	 * Write data to the file
+	 * 
+	 * @param string $data
+	 */
+	public function write($data) {
+		fwrite($this -> fp, $data);
+	}
+}
diff --git a/htdocs/includes/escpos/src/ImagePrintBuffer.php b/htdocs/includes/escpos/src/ImagePrintBuffer.php
new file mode 100644
index 00000000000..08ca64ac43e
--- /dev/null
+++ b/htdocs/includes/escpos/src/ImagePrintBuffer.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ *
+ * This class renders text to small images on-the-fly. It attempts to mimic the
+ * behaviour of text output, whilst supporting any fonts & character encodings
+ * which your system can handle. This class currently requires Imagick.
+ */
+class ImagePrintBuffer implements PrintBuffer {
+	private $printer;
+	
+	function __construct() {
+		if(!EscposImage::isImagickLoaded()) {
+			throw new Exception("ImagePrintBuffer requires the imagick extension");
+		}
+	}
+
+	function flush() {
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+	}
+
+	function getPrinter() {
+		return $this -> printer;
+	}
+
+	function setPrinter(Escpos $printer = null) {
+		$this -> printer = $printer;
+	}
+
+	function writeText($text) {
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+		if($text == null) {
+			return;
+		}
+		$text = trim($text, "\n");
+		/* Create Imagick objects */
+		$image = new Imagick();
+		$draw = new ImagickDraw();
+		$color = new ImagickPixel('#000000');
+		$background = new ImagickPixel('white');
+
+		/* Create annotation */
+		//$draw -> setFont('Arial');// (not necessary?)
+		$draw -> setFontSize(24); // Size 21 looks good for FONT B
+		$draw -> setFillColor($color);
+		$draw -> setStrokeAntialias(true);
+		$draw -> setTextAntialias(true);
+		$metrics = $image -> queryFontMetrics($draw, $text);
+		$draw -> annotation(0, $metrics['ascender'], $text);
+
+		/* Create image & draw annotation on it */
+		$image -> newImage($metrics['textWidth'], $metrics['textHeight'], $background);
+		$image -> setImageFormat('png');
+		$image -> drawImage($draw);
+		//$image -> writeImage("test.png");
+		
+		/* Save image */
+		$escposImage = new EscposImage();
+		$escposImage -> readImageFromImagick($image);
+		$size = Escpos::IMG_DEFAULT;
+		$this -> printer -> bitImage($escposImage, $size);
+	}
+
+	function writeTextRaw($text) {
+		if($this -> printer == null) {
+			throw new LogicException("Not attached to a printer.");
+		}
+		$this -> printer -> getPrintConnector() -> write($data);
+	}
+}
diff --git a/htdocs/includes/escpos/src/NetworkPrintConnector.php b/htdocs/includes/escpos/src/NetworkPrintConnector.php
new file mode 100644
index 00000000000..4dd2c39f115
--- /dev/null
+++ b/htdocs/includes/escpos/src/NetworkPrintConnector.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ * 
+ * PrintConnector for directly opening a network socket to a printer to send it commands.
+ */
+class NetworkPrintConnector extends FilePrintConnector {
+	public function __construct($ip, $port = "9100") {
+		$this -> fp = @fsockopen($ip, $port, $errno, $errstr);
+		if($this -> fp === false) {
+			throw new Exception("Cannot initialise NetworkPrintConnector: " . $errstr);
+		}
+	}
+}
diff --git a/htdocs/includes/escpos/src/P822DCapabilityProfile.php b/htdocs/includes/escpos/src/P822DCapabilityProfile.php
new file mode 100644
index 00000000000..7c3b5abe6dd
--- /dev/null
+++ b/htdocs/includes/escpos/src/P822DCapabilityProfile.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * This capability profile is designed for the P-822D.
+ * 
+ * See
+ * https://github.com/mike42/escpos-php/issues/50
+ */
+class P822DCapabilityProfile extends DefaultCapabilityProfile {
+	function getSupportedCodePages() {
+		return array(
+			0 => CodePage::CP437,
+			1 => false, // Katakana
+			2 => CodePage::CP850,
+			3 => CodePage::CP860,
+			4 => CodePage::CP863,
+			5 => CodePage::CP865,
+			6 => false, // Western Europe
+			7 => false, // Greek
+			8 => false, // Hebrew
+			9 => false, // Eastern europe
+			10 => false, // Iran
+			16 => CodePage::CP1252 ,
+			17 => CodePage::CP866 ,
+			18 => CodePage::CP852 ,
+			19 => CodePage::CP858,
+			20 => false, // Iran II
+			21 => false, // latvian
+			22 => false,  //Arabic
+			23 => false, // PT151, 1251
+			24 => CodePage::CP747,
+			25 => CodePage::CP1257,
+			27 => false, // Vietnam,
+			28 => CodePage::CP864,
+			29 => CodePage::CP1001,
+			30 => false, // Uigur
+			31 => false, // Hebrew
+			32 => CodePage::CP1255,
+			33 => CodePage::CP720,
+			34 => CodePage::CP1256,
+			35 => CodePage::CP1257,
+			255 => false, // Thai
+			
+			50 => CodePage::CP437,
+			51 => false, // Jatakana,
+			52 => CodePage::CP437,
+			53 => CodePage::CP858,
+			54 => CodePage::CP852,
+			55 => CodePage::CP860,
+			56 => CodePage::CP861,
+			57 => CodePage::CP863,
+			58 => CodePage::CP865,
+			59 => CodePage::CP866,
+			60 => CodePage::CP855,
+			61 => CodePage::CP857,
+			62 => CodePage::CP862,
+			63 => CodePage::CP864,
+			64 => CodePage::CP737,
+			65 => CodePage::CP851,
+			66 => CodePage::CP869,
+			67 => CodePage::CP928,
+			68 => CodePage::CP772,
+			69 => CodePage::CP774,
+			70 => CodePage::CP874,
+			71 => CodePage::CP1252,
+			72 => CodePage::CP1250,
+			73 => CodePage::CP1251,
+			74 => CodePage::CP3840,
+			75 => CodePage::CP3841,
+			76 => CodePage::CP3843,
+			77 => CodePage::CP3844,
+			78 => CodePage::CP3845,
+			79 => CodePage::CP3846,
+			80 => CodePage::CP3847,
+			81 => CodePage::CP3848,
+			82 => CodePage::CP1001,
+			83 => CodePage::CP2001,
+			84 => CodePage::CP3001,
+			85 => CodePage::CP3002,
+			86 => CodePage::CP3011,
+			87 => CodePage::CP3012,
+			88 => CodePage::CP3021,
+			89 => CodePage::CP3041
+		);
+	}
+	
+	public function getSupportsGraphics() {
+		/* Ask the driver to use bitImage wherever possible instead of graphics */
+		return false;
+	}
+}
diff --git a/htdocs/includes/escpos/src/PrintBuffer.php b/htdocs/includes/escpos/src/PrintBuffer.php
new file mode 100644
index 00000000000..9e3b110085f
--- /dev/null
+++ b/htdocs/includes/escpos/src/PrintBuffer.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ * 
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ * 
+ * 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.
+ * 
+ * Print buffers manage newlines and character encoding for the target printer.
+ * They are used as a swappable component: text or image-based output.
+ * 
+ * - Text output (EscposPrintBuffer) is the fast default, and is recommended for
+ *   most people, as the text output can be more directly manipulated by ESC/POS
+ *   commands.
+ * - Image output (ImagePrintBuffer) is designed to accept more encodings than the
+ *   physical printer supports, by rendering the text to small images on-the-fly.
+ *   This takes a lot more CPU than sending text, but is necessary for some users.
+ * - If your use case fits outside these, then a further speed/flexibility trade-off
+ *   can be made by printing directly from generated HTML or PDF.
+ */
+interface PrintBuffer {
+	/**
+	 * Cause the buffer to send any partial input and wait on a newline.
+	 * If the printer is already on a new line, this does nothing.
+	 */
+	function flush();
+
+	/**
+	 * Used by Escpos to check if a printer is set.
+	 */
+	function getPrinter();
+
+	/**
+	 * Used by Escpos to hook up one-to-one link between buffers and printers.
+	 * 
+	 * @param Escpos $printer New printer
+	 */
+	function setPrinter(Escpos $printer = null);
+
+	/**
+	 * Accept UTF-8 text for printing.
+	 * 
+	 * @param string $text Text to print
+	 */
+	function writeText($text);
+
+	/**
+	 * Accept 8-bit text in the current encoding and add it to the buffer.
+	 * 
+	 * @param string $text Text to print, already the target encoding.
+	 */
+	function writeTextRaw($text);
+}
+?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/PrintConnector.php b/htdocs/includes/escpos/src/PrintConnector.php
new file mode 100644
index 00000000000..f1d37be9c55
--- /dev/null
+++ b/htdocs/includes/escpos/src/PrintConnector.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ * 
+ * Interface passed to Escpos class for receiving print data. Print connectors
+ * are responsible for transporting this to the actual printer.
+ */
+interface PrintConnector {
+	/**
+	 * Print connectors should cause a NOTICE if they are deconstructed
+	 * when they have not been finalized.
+	 */
+	public function __destruct();
+
+	/**
+	 * Finish using this print connector (close file, socket, send
+	 * accumulated output, etc).
+	 */
+	public function finalize();
+
+	/**
+	 * @param string $data
+	 * @return Data read from the printer, or false where reading is not possible.
+	 */
+	public function read($len);
+	
+	/**
+	 * @param string $data
+	 */
+	public function write($data);
+}
diff --git a/htdocs/includes/escpos/src/SimpleCapabilityProfile.php b/htdocs/includes/escpos/src/SimpleCapabilityProfile.php
new file mode 100644
index 00000000000..7076b5e16cb
--- /dev/null
+++ b/htdocs/includes/escpos/src/SimpleCapabilityProfile.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This capability profile is designed for non-Epson printers sold online. Without knowing
+ * their character encoding table, only CP437 output is assumed, and graphics() calls will
+ * be disabled, as it usually prints junk on these models.
+ */
+class SimpleCapabilityProfile extends DefaultCapabilityProfile {
+	function getSupportedCodePages() {
+		/* Use only CP437 output */
+		return array(0 => CodePage::CP437);
+	}
+	
+	public function getSupportsGraphics() {
+		/* Ask the driver to use bitImage wherever possible instead of graphics */
+		return false;
+	}
+}
diff --git a/htdocs/includes/escpos/src/StarCapabilityProfile.php b/htdocs/includes/escpos/src/StarCapabilityProfile.php
new file mode 100644
index 00000000000..f61774a5e30
--- /dev/null
+++ b/htdocs/includes/escpos/src/StarCapabilityProfile.php
@@ -0,0 +1,82 @@
+<?php
+class StarCapabilityProfile extends DefaultCapabilityProfile {
+	function getCustomCodePages() {
+		// Code table reference: http://www.starmicronics.com/support/mannualfolder/sp2000pm.pdf
+		return array(
+			'CP3011' => "ÇüéâäàåçêëèïîìÄÅ" . 
+						"ÉæÆôöòûùÿÖÜ¢£¥₧ƒ" . 
+						"áíóúñѪº¿⌐¬½¼¡«»" . 
+						"░▒▓│┤Ā╢ņ╕╣║╗╝╜╛┐" . 
+						"└┴┬├─┼ā╟╚╔╩╦╠═╬╧" . 
+						"Š╤čČ╘╒ģĪī┘┌█▄ūŪ▀" . 
+						"αßΓπΣσµτΦΘΩδ∞φε∩" . 
+						"ĒēĢķĶļĻžŽ∙·√Ņš■ ",
+			'CP3012' => "АБВГДЕЖЗИЙКЛМНОП" . 
+						"РСТУФХЦЧШЩЪЫЬЭЮЯ" . 
+						"абвгдежзийклмноп" . 
+						"░▒▓│┤Ā╢ņ╕╣║╗╝Ō╛┐" . 
+						"└┴┬├─┼ā╟╚╔╩╦╠═╬╧" . 
+						"Š╤čČ╘╒ģĪī┘┌█▄ūŪ▀" . 
+						"рстуфхцчшщъыьэюя" . 
+						"ĒēĢķĶļĻžŽ∙·√Ņš■ "
+		);
+	}
+
+	function getSupportedCodePages() {
+		return array(
+				0 => CodePage::CP437, // "Normal"
+				1 => CodePage::CP437,
+				2 => CodePage::CP932,
+				3 => CodePage::CP437, 
+				4 => CodePage::CP858,
+				5 => CodePage::CP852,
+				6 => CodePage::CP860,
+				7 => CodePage::CP861,
+				8 => CodePage::CP863,
+				9 => CodePage::CP865,
+				10 => CodePage::CP866,
+				11 => CodePage::CP855,
+				12 => CodePage::CP857,
+				13 => CodePage::CP862,
+				14 => CodePage::CP864,
+				15 => CodePage::CP737,
+				16 => CodePage::CP851,
+				17 => CodePage::CP869,
+				18 => CodePage::CP928,
+				19 => CodePage::CP772,
+				20 => CodePage::CP774,
+				21 => CodePage::CP874,
+				32 => CodePage::CP1252,
+				33 => CodePage::CP1250,
+				34 => CodePage::CP1251,
+				64 => CodePage::CP3840,
+				65 => CodePage::CP3841,
+				66 => CodePage::CP3843,
+				67 => CodePage::CP3844,
+				68 => CodePage::CP3845,
+				69 => CodePage::CP3846,
+				70 => CodePage::CP3847,
+				71 => CodePage::CP3848,
+				72 => CodePage::CP1001,
+				73 => CodePage::CP2001,
+				74 => CodePage::CP3001,
+				75 => CodePage::CP3002,
+				76 => 'custom:CP3011',
+				77 => 'custom:CP3012',
+				78 => CodePage::CP3021,
+				79 => CodePage::CP3041,
+				96 => false, // Thai Character Code 42
+				97 => false, // Thai Character Code 11
+				98 => false, // Thai Character Code 13
+				99 => false, // Thai Character Code 14
+				100 => false, // Thai Character Code 16
+				101 => false, // Thai Character Code 17
+				102 => false, // Thai Character Code 18
+				255 => false);
+	}
+
+	function getSupportsStarCommands() {
+		/* Allows Escpos.php to substitute emulated ESC/POS commands with native ones for this printer. */ 
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/WindowsPrintConnector.php b/htdocs/includes/escpos/src/WindowsPrintConnector.php
new file mode 100644
index 00000000000..2d3314ee698
--- /dev/null
+++ b/htdocs/includes/escpos/src/WindowsPrintConnector.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * escpos-php, a Thermal receipt printer library, for use with
+ * ESC/POS compatible printers.
+ *
+ * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
+ * 	incorporating modifications by:
+ *  - Roni Saha <roni.cse@gmail.com>
+ *  - Gergely Radics <gerifield@ustream.tv>
+ *  - Warren Doyle <w.doyle@fuelled.co>
+ *
+ * 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.
+ * 
+ * Connector for sending print jobs to
+ * - local ports on windows (COM1, LPT1, etc)
+ * - shared (SMB) printers from any platform (\\server\foo)
+ * For USB printers or other ports, the trick is to share the printer with a generic text driver, then access it locally.
+ */
+class WindowsPrintConnector implements PrintConnector {
+	/**
+	 * @var array Accumulated lines of output for later use.
+	 */
+	private $buffer;
+
+	/**
+	 * @var string The hostname of the target machine, or null if this is a local connection.
+	 */
+	private $hostname;
+
+	/**
+	 * @var boolean True if a port is being used directly (must be Windows), false if network shares will be used.
+	 */
+	private $isLocal;
+
+	/**
+	 * @var int Platform we're running on, for selecting different commands. See PLATFORM_* constants.
+	 */
+	private $platform;
+
+	/**
+	 * @var string The name of the target printer (eg "Foo Printer") or port ("COM1", "LPT1").
+	 */
+	private $printerName;
+
+	/**
+	 * @var string Login name for network printer, or null if not using authentication.
+	 */
+	private $userName;
+
+	/**
+	 * @var string Password for network printer, or null if no password is required.
+	 */
+	private $userPassword;
+
+	/**
+	 * @var string Workgroup that the printer is located on
+	 */
+	private $workgroup;
+
+	/**
+	 * @var int represents Linux
+	 */
+	const PLATFORM_LINUX = 0;
+
+	/**
+	 * @var int represents Mac
+	 */
+	const PLATFORM_MAC = 1;
+
+	/**
+	 * @var int represents Windows
+	 */
+	const PLATFORM_WIN = 2;
+
+	/**
+	 * @var string Valid local ports.
+	 */
+	const REGEX_LOCAL = "/^(LPT\d|COM\d)$/";
+
+	/**
+	 * @var string Valid printer name.
+	 */
+	const REGEX_PRINTERNAME = "/^(\w-+)(\s\w-*)*$/";
+
+	/**
+	 * @var string Valid smb:// URI containing hostname & printer with optional user & optional password only.
+	 */
+	const REGEX_SMB = "/^smb:\/\/(\s\w-+(:\s\w-+)?@)?[\w-]+\/([\w-]+\/)?(\w-+)(\s\w-+)*$/";
+
+	/**
+	 * @param string $dest
+	 * @throws BadMethodCallException
+	 */
+	public function __construct($dest) {
+		$this -> platform = $this -> getCurrentPlatform();	
+		$this -> isLocal = false;
+		$this -> buffer = null;
+		$this -> userName = null;
+		$this -> userPassword = null;
+		$this -> workgroup = null;
+		if(preg_match(self::REGEX_LOCAL, $dest) == 1) {
+			// Straight to LPT1, COM1 or other local port. Allowed only if we are actually on windows.
+			if($this -> platform !== self::PLATFORM_WIN) {
+				throw new BadMethodCallException("WindowsPrintConnector can only be used to print to a local printer ('".$dest."') on a Windows computer.");
+			}
+			$this -> isLocal = true;
+			$this -> hostname = null;
+			$this -> printerName = $dest;
+		} else if(preg_match(self::REGEX_SMB, $dest) == 1) {
+			// Connect to samba share, eg smb://host/printer
+			$part = parse_url($dest);
+			$this -> hostname = $part['host'];
+			/* Printer name and optional workgroup */
+			$path = ltrim($part['path'], '/');
+			if(strpos($path, "/") !== false) {
+				$pathPart = explode("/", $path);
+				$this -> workgroup = $pathPart[0];
+				$this -> printerName = $pathPart[1];
+			} else {
+				$this -> printerName = $path;
+			}
+			/* Username and password if set */
+			if(isset($part['user'])) {
+				$this -> userName = $part['user'];
+				if(isset($part['pass'])) {
+					$this -> userPassword = $part['pass'];
+				}
+			}
+		} else if(preg_match(self::REGEX_PRINTERNAME, $dest) == 1) {
+			// Just got a printer name. Assume it's on the current computer.
+			$hostname = gethostname();
+			if(!$hostname) {
+				$hostname = "localhost";
+			}
+			$this -> hostname = $hostname;
+			$this -> printerName = $dest;
+		} else {
+			throw new BadMethodCallException("Printer '" . $dest . "' is not a valid printer name. Use local port (LPT1, COM1, etc) or smb://computer/printer notation.");
+		}
+		$this -> buffer = array();
+	}
+
+	public function __destruct() {
+		if($this -> buffer !== null) {
+			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
+		}
+	}
+
+	public function finalize() {
+		$data = implode($this -> buffer);
+		$this -> buffer = null;
+		if($this -> platform == self::PLATFORM_WIN) {
+			$this -> finalizeWin($data);
+		} else if($this -> platform == self::PLATFORM_LINUX) {
+			$this -> finalizeLinux($data);
+		} else {
+			$this -> finalizeMac($data);
+		}
+	}
+
+	/**
+	 * Send job to printer -- platform-specific Linux code.
+	 * 
+	 * @param string $data Print data
+	 * @throws Exception
+	 */
+	protected function finalizeLinux($data) {
+		/* Non-Windows samba printing */
+		$device = "//" . $this -> hostname . "/" . $this -> printerName;
+		if($this -> userName !== null) {
+			$user = ($this -> workgroup != null ? ($this -> workgroup . "\\") : "") . $this -> userName;
+			if($this -> userPassword == null) {
+				// No password
+				$command = sprintf("smbclient %s -U %s -c %s -N",
+						escapeshellarg($device),
+						escapeshellarg($user),
+						escapeshellarg("print -"));
+				$redactedCommand = $command;
+			} else {
+				// With password
+				$command = sprintf("smbclient %s %s -U %s -c %s",
+						escapeshellarg($device),
+						escapeshellarg($this -> userPassword),
+						escapeshellarg($user),
+						escapeshellarg("print -"));
+				$redactedCommand = sprintf("smbclient %s %s -U %s -c %s",
+						escapeshellarg($device),
+						escapeshellarg("*****"),
+						escapeshellarg($user),
+						escapeshellarg("print -"));
+			}
+		} else {
+			// No authentication information at all
+			$command = sprintf("smbclient %s -c %s -N",
+					escapeshellarg($device),
+					escapeshellarg("print -"));
+			$redactedCommand = $command;
+		}
+		$retval = $this -> runCommand($command, $outputStr, $errorStr, $data);
+		if($retval != 0) {
+			throw new Exception("Failed to print. Command \"$redactedCommand\" failed with exit code $retval: " . trim($outputStr));
+		}
+	}
+	
+	protected function finalizeMac($data) {
+		throw new Exception("Mac printing not implemented.");
+	}
+	
+	/**
+	 * Send data to printer -- platform-specific Windows code.
+	 * 
+	 * @param string $data
+	 */
+	protected function finalizeWin($data) {
+		/* Windows-friendly printing of all sorts */
+		if(!$this -> isLocal) {
+			/* Networked printing */
+			$device = "\\\\" . $this -> hostname . "\\" . $this -> printerName;
+			if($this -> userName !== null) {
+				/* Log in */
+				$user = "/user:" . ($this -> workgroup != null ? ($this -> workgroup . "\\") : "") . $this -> userName;
+				if($this -> userPassword == null) {
+					$command = sprintf("net use %s %s",
+							escapeshellarg($device),
+							escapeshellarg($user));
+					$redactedCommand = $command;
+				} else {
+					$command = sprintf("net use %s %s %s",
+							escapeshellarg($device),
+							escapeshellarg($user),
+							escapeshellarg($this -> userPassword));
+					$redactedCommand = sprintf("net use %s %s %s",
+							escapeshellarg($device),
+							escapeshellarg($user),
+							escapeshellarg("*****"));
+				}
+				$retval = $this -> runCommand($command, $outputStr, $errorStr);
+				if($retval != 0) {
+					throw new Exception("Failed to print. Command \"$redactedCommand\" failed with exit code $retval: " . trim($errorStr));
+				}
+			}
+			/* Final print-out */
+			$filename = tempnam(sys_get_temp_dir(), "escpos");
+			file_put_contents($filename, $data);
+			if(!$this -> runCopy($filename, $device)){
+				throw new Exception("Failed to copy file to printer");
+			}
+			unlink($filename);
+		} else {
+			/* Drop data straight on the printer */
+			if(!$this -> runWrite($data,  $this -> printerName)) {
+				throw new Exception("Failed to write file to printer at " . $this -> printerName);
+			}
+		}
+	}
+	
+	/**
+	 * @return string Current platform. Separated out for testing purposes.
+	 */
+	protected function getCurrentPlatform() {
+		if(PHP_OS == "WINNT") {
+			return self::PLATFORM_WIN;
+		}
+		if(PHP_OS == "Darwin") {
+			return self::PLATFORM_MAC;
+		}
+		return self::PLATFORM_LINUX;
+	}
+	
+	/* (non-PHPdoc)
+	 * @see PrintConnector::read()
+	 */
+	public function read($len) {
+		/* Two-way communication is not supported */
+		return false;
+	}
+	
+	/**
+	 * Run a command, pass it data, and retrieve its return value, standard output, and standard error.
+	 * 
+	 * @param string $command the command to run.
+	 * @param string $outputStr variable to fill with standard output.
+	 * @param string $errorStr variable to fill with standard error.
+	 * @param string $inputStr text to pass to the command's standard input (optional).
+	 * @return number
+	 */
+	protected function runCommand($command, &$outputStr, &$errorStr, $inputStr = null) {
+		$descriptors = array(
+				0 => array("pipe", "r"),
+				1 => array("pipe", "w"),
+				2 => array("pipe", "w"),
+		);
+		$process = proc_open($command, $descriptors, $fd);
+		if (is_resource($process)) {
+			/* Write to input */
+			if($inputStr !== null) {
+				fwrite($fd[0], $inputStr);
+			}
+			fclose($fd[0]);
+			/* Read stdout */
+			$outputStr = stream_get_contents($fd[1]);
+			fclose($fd[1]);
+			/* Read stderr */
+			$errorStr = stream_get_contents($fd[2]);
+			fclose($fd[2]);
+			/* Finish up */
+			$retval = proc_close($process);
+			return $retval;
+		} else {
+			/* Method calling this should notice a non-zero exit and print an error */
+			return -1;
+		}
+	}
+	
+	/**
+	 * Copy a file. Separated out so that nothing is actually printed during test runs.
+	 * 
+	 * @param string $from Source file
+	 * @param string $to Destination file
+	 * @return boolean True if copy was successful, false otherwise
+	 */
+	protected function runCopy($from, $to) {
+		return copy($from, $to);
+	}
+	
+	/**
+	 * Write data to a file. Separated out so that nothing is actually printed during test runs.
+	 * 
+	 * @param string $data Data to print
+	 * @param string $to Destination file
+         * @return boolean True if write was successful, false otherwise
+	 */
+	protected function runWrite($data, $to) {
+		return file_put_contents($data, $to) !== false;
+	}
+
+	public function write($data) {
+		$this -> buffer[] = $data;
+	}
+}
diff --git a/htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz
new file mode 100644
index 0000000000000000000000000000000000000000..43ad39d229582af5ad7121088bf2c6287e067e11
GIT binary patch
literal 12928
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz
new file mode 100644
index 0000000000000000000000000000000000000000..288b7d3740782fbcc9d9a28d71a6ecc330683eb4
GIT binary patch
literal 1116
zcmV-i1f%;OiwFP!0000019jGCa}-Aq2H^j4zu=@ppj-W#6S@x+l>LD!S5XvI%G|-(
zDBPZM&N)j+LdafhIRGb;P0kqyYz!D2xgGlLa@lWxQt7$b*`As1-br{d@8Etf?nM$G
zCHCw~l<!MM$`W2tacRiKUgXqa_rG^=j~6W~_ln96z2_60$2j+M9^~B1d5H4}=W)&x
zoJTp&aGvHo$+?zu9p^OXVb1lO7dbC;p69&Id6n}f=N#uw$^p-lV1P48h?p0-SIskG
ztBHrw$9anL0_Qc(bDSIbdU(nPeC~j3c)0pZ10T+lGuYtF%RAtE74V`8NCJfs=E(A$
zlLK<z%spFeIB6@P`y_hjB<q}$+;#37PSVu5v0lH$@Giqi(Kzog_JL%A^Q_^dYd9yV
z<J^cRTWL5+Di?pZ;XQ`88*Z%2Cm$u}q^CM3-yi43e)`7#_@oaxCm$Q<R^A$Y&Tlik
z)o`P}e51a6Qr6B%pK|AGyf>RM>N;gO`CvM?<}uDCNAj@HmhwhZCfOE_CYw{>ZDVf!
zrP{9H4RVQ(<`;%MzXIgRu7}KTVtJ#+Q=|sNQ26~KPXc$d7?qYbz8mBu+;Ah|(?)@0
zjDpP=pY|1FdXkS}l(WWSN%@7tjoDL1*Q(+dr+{3_TvGGPaqvGb_)ag9{9yNo70G}7
zmiW)zet+SINM-m}ZuJhT0Am8xfPR4*z@R`apjV&{FeFe97!f!O7#BzZCIr%eQGp|X
z8G)mKX@Lx2Qs84it-vRMI)P(=v_J!3SfCM5FVF;76lex43uFQF0zP0}AO~0#XaQ^r
zv;uMhZGcXJc7Xur(g7F{=mg*xy28J>Cp+nuAzMuXJ$Ox@KrdiQpbxMh&<|J>7y!%(
z3<4Sjh7cK!e;9x{MgZ85QN*5U5E;V|9QQb2Ltp}c<emgzbyEPO-82A4HG}u&5d5qP
zHf>I&S!5oPtrl5OLD?)qd_=RPf-_xKK_0BA_#($uaPX@th<Qz=MPyy2OXP$KQfxz|
zL*%5c0;jO4k`?(>1r_p{3XUpJ!MjeWREm7Ag5&!_<LMUJQt1)-Ql(wwD-}fewF;Wt
zH!7(6(<<m{XH>BEvnp6uUIi7lt%62&P6e58UImqUL8VRPqDrgCB^Bi1w<^fP?^KZB
zmsL=ES9G5-^Hr6M$TiLIl*n}zG}jv{c<QDKcI=i4PWiSJTprEh4w?l{^e#qVQTGJ4
zF~@z3Kmk0!h#G;1DC;GGM;L+VA7c(Az!Ly=<tYG3^9+DI{~oJLAwPe>Yw-2>5zioy
zpY$0_`y7%+U-%i(V~>8(AxM}PDoCndAsHm_OBGD~3VXdG@LH$AIsb-t&kDTJfRUPS
zF$A;xu0v3Re?Y3x&;P_j_(=YxseyR^#t^_i5qG&M4BDGK;D#4|jh0lz<Hft;#nE_C
iNi4Rzv|>kjbXRFnB3hb^MN8s^XWjvL>zN7b6aWBu>k}&g

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e0bb0e5fec5c59a4131ae1f2f4151d392f435b91
GIT binary patch
literal 9416
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/bootstrap.php b/htdocs/includes/escpos/test/bootstrap.php
new file mode 100644
index 00000000000..41b04f5ca6b
--- /dev/null
+++ b/htdocs/includes/escpos/test/bootstrap.php
@@ -0,0 +1,27 @@
+<?php
+error_reporting(E_ALL);
+ini_set('display_errors', 1);
+
+require_once(dirname(__FILE__) . "/../vendor/autoload.php");
+require_once(dirname(__FILE__) . "/../Escpos.php");
+require_once(dirname(__FILE__) . "/../src/DummyPrintConnector.php");
+
+/**
+ * Used in many of the tests to to output known-correct
+ * strings for use in tests. 
+ */
+function friendlyBinary($in) {
+	if(strlen($in) == 0) {
+		return $in;
+	}
+	/* Print out binary data with PHP \x00 escape codes,
+	 for builting test cases. */
+	$chars = str_split($in);
+	foreach($chars as $i => $c) {
+		$code = ord($c);
+		if($code < 32 || $code > 126) {
+			$chars[$i] = "\\x" . bin2hex($c);
+		}
+	}
+	return implode($chars);
+}
diff --git a/htdocs/includes/escpos/test/integration/ExampleTest.php b/htdocs/includes/escpos/test/integration/ExampleTest.php
new file mode 100644
index 00000000000..689891e2432
--- /dev/null
+++ b/htdocs/includes/escpos/test/integration/ExampleTest.php
@@ -0,0 +1,126 @@
+<?php
+class ExampleTest extends PHPUnit_Framework_TestCase {
+	/* Verify that the examples don't fizzle out with fatal errors */
+	private $exampleDir;
+	
+	public function setup() {
+		$this -> exampleDir = dirname(__FILE__) . "/../../example/";
+	}
+	
+	public function testBitImage() {
+		$this -> requireGraphicsLibrary();
+		$outp = $this -> runExample("bit-image.php");
+		$this -> outpTest($outp, "bit-image.bin");
+	}
+	
+	public function testCharacterEncodings() {
+		$outp = $this -> runExample("character-encodings.php");
+		$this -> outpTest($outp, "character-encodings.bin");
+	}
+	
+	public function testCharacterTables() {
+		$outp = $this -> runExample("character-tables.php");
+		$this -> outpTest($outp, "character-tables.bin");
+	}
+	
+	private function outpTest($outp, $fn) {
+		$file = dirname(__FILE__) . "/resources/output/".$fn;
+		if(!file_exists($file)) {
+			file_put_contents($file, $outp);
+		}
+		$this -> assertEquals($outp, file_get_contents($file));
+	}
+	
+	public function testDemo() {
+		$this -> requireGraphicsLibrary();
+		$outp = $this -> runExample("demo.php");
+		$this -> outpTest($outp, "demo.bin");
+	}
+	
+	public function testGraphics() {
+		$this -> requireGraphicsLibrary();
+		$outp = $this -> runExample("graphics.php");
+		$this -> outpTest($outp, "graphics.bin");
+	}
+	
+	public function testReceiptWithLogo() {
+		$this -> requireGraphicsLibrary();
+		$outp = $this -> runExample("receipt-with-logo.php");
+		$this -> outpTest($outp, "receipt-with-logo.bin");
+	}
+	
+	public function testQrCode() {
+		$outp = $this -> runExample("qr-code.php");
+		$this -> outpTest($outp, "qr-code.bin");
+	}
+
+	public function testBarcode() {
+		$outp = $this -> runExample("barcode.php");
+		$this -> outpTest($outp, "barcode.bin");
+	}
+	
+	public function testTextSize() {
+		$outp = $this -> runExample("text-size.php");
+		$this -> outpTest($outp, "text-size.bin");
+	}
+
+	/**
+	 * @large
+	 */
+	public function testPrintFromPdf() {
+		if(!EscposImage::isImagickLoaded()) {
+			$this -> markTestSkipped("imagick plugin required for this test");
+		}
+		$outp = $this -> runExample("print-from-pdf.php");
+		$this -> outpTest(gzcompress($outp, 9), "print-from-pdf.bin.z"); // Compressing output because it's ~1MB
+	}
+
+	public function testInterfaceEthernet() {
+		// Test attempts DNS lookup on some machine
+		$outp = $this -> runExample("interface/ethernet.php");
+		$this -> outpTest($outp, "interface.bin");
+	}
+	
+	public function testInterfaceLinuxUSB() {
+		$outp = $this -> runExample("interface/linux-usb.php");
+		$this -> outpTest($outp, "interface.bin");
+	}
+	
+	public function testInterfaceWindowsUSB() {
+		// Output varies between platforms, not checking.
+		$outp = $this -> runExample("interface/windows-usb.php");
+		$this -> outpTest($outp, "interface.bin");
+	}
+	
+	public function testInterfaceSMB() {
+		// Output varies between platforms, not checking.
+		$outp = $this -> runExample("interface/smb.php");
+		$this -> outpTest($outp, "interface.bin");
+	}
+	
+	public function testInterfaceWindowsLPT() {
+		// Output varies between platforms, not checking.
+		$outp = $this -> runExample("interface/windows-lpt.php");
+		$this -> outpTest($outp, "interface.bin");
+	}
+	
+	private function runExample($fn) {
+		// Change directory and check script
+		chdir($this -> exampleDir);
+		$this -> assertTrue(file_exists($fn), "Script $fn not found.");
+		// Run command and save output
+		ob_start();
+		passthru("php " . escapeshellarg($fn), $retval);
+		$outp = ob_get_contents();
+		ob_end_clean();
+		// Check return value
+		$this -> assertEquals(0, $retval, "Example $fn exited with status $retval");
+		return $outp;
+	}
+	
+	protected function requireGraphicsLibrary() {
+		if(!EscposImage::isGdLoaded() && !EscposImage::isImagickLoaded()) {
+			$this -> markTestSkipped("This test requires a graphics library.");
+		}
+	}
+}
diff --git a/htdocs/includes/escpos/test/integration/resources/output/barcode.bin b/htdocs/includes/escpos/test/integration/resources/output/barcode.bin
new file mode 100644
index 0000000000000000000000000000000000000000..79a2daf803edde452d5e0e47aa7e2545bb108962
GIT binary patch
literal 2342
zcmbVOOK;Oa5N<#~apB0Rsx*}VrKNc|DSdDO$4wy|BBZnx*Nwd-t2$oGyJ=eG&og6h
z5^s}~7F9~u-kope`{uFU{<bqLZ|~MG_^pOSDxrmpo$cL?t^|$moSh#VJJ<f3y4z?T
zem*)rIjy^n*OxaOcS=h;Egs1U?mS!Gk$Q+5&zCmvF#5mz<ySoNdoFHySc!N%&_jsF
zBc6%?l2nG{KtrFUfeg8-I?i^x<TfA}vUGk*#6dI;MLdA=B$e@C54U-64WSqaT}6ux
zU&flp`U_ZecCI~}A7b}-9D?g+4isn!EDVcqz{XmRm=*zxqPw-=4q|T=oFT)EYI`l!
zK#mfIR990zvKd#hFs!&fLbvBzT=UFfB(0ZbiTsZL1!O@O288iywnmT>3uKkWF_~=6
z1i%v|qv<?p%M@1PVBHavt>qI-U>&ea$oDE>xBk=Xy3Jafe%B`J;d*>LHHzR~kC9YO
zOJ8`fzSoj#5cb<y3aEb@RE0?IgxH-tlHC6m%-Q;a`42+K<*ZOnyLBJOLGzS2T(MNJ
ze#F7d4i+UtHX9(58Yns9pb{Pk7G=7cDMFL)fXcDYQ+0qRSiqH~rq}XmV4&~ztJxaU
z(<@+M$D*}m_5Q=BO0`BtFU=Bd+P6Aoc~;B&dvK|E2uy*}EY&roWnw|>U$lQ;>}L>W
ziHYl6oUfw0V9IZJZ1{lulTSZ&;Gi2l<afYQ4m_qY8e#$<VInn3bn|Ijft3hWWQ%gb
z=+2$OBSwfhVb~caN+t?PnMWybx@Q@|@hK;iHwW`zw8_=10*ZZBWBnk6(OBX1=P=F%
za~6VSV&(==mN5sWiDxe90pJ_QyupdSN0U4hO5-Il7HWu)dcsjI)5s1>k_bmSU4phK
zfEDE7-@<VfEJeIr0}u81zBzxGr+iMc5bu)xd#ac(8N?Pr%${>i`Dr$Y?$tRCnfMO8
zp5N(!P{3}Oh%z}5y+pNbc|lOp6NCIgeVMHdy4%P`!BgO=`9N`vx{Q;ArvXzOK7zU%
z^<`vt!<6_?KGAjO_2LPGoTId0z+;|bduCrA#rt~NGUg`w&RhFU5ypqv9cr4|0lLlU
myC4{*<%Ub&1!=k2$p0TU_biE~{#W=!QNEb^?`U=9J^u^w*`<2`

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/bit-image.bin b/htdocs/includes/escpos/test/integration/resources/output/bit-image.bin
new file mode 100644
index 0000000000000000000000000000000000000000..462eb1a0bf32bbe4bd68b8e9dc8304bc6559549b
GIT binary patch
literal 9789
zcmeI2F>l*O6o4N~Km-iK^i~;FL=GL2p@BvZhRz)ebP9|X-K1KqB~%s#T524iFxjbN
zmdwphF^m3y{)0q7hm2K`Au8;Meed0)cvM`p2s#yahROTx9q-<~dptee>7(P5VRR9N
z(PjU9I*!88dH*cB2>VGCPLt7O77fD3quDT=4Wlp~529q}>(NZt(iOtf`24&-89WTX
zis#|QFrJSGVLTZ>3FjBl&d1a6lWvHQd`9iwe-Mto33b_7(w`1Trx#c@h_S~>JllC3
zC*R_;;gfitNcYLZot=B%bzmQ!!M{wZs8w`|A~y^CqF9<76veH{X;G|AE-)F4%@svf
z6)@)&yCgT*BVJVUZANu!3jGrYRDV^q_g-uan4hon52iuX(*kPjtsyn)cimf11|K=^
z@P1H}uZ~PUoUXnP41*soS63!CSF5$jt!=(}T9@BCb-sjJ`|T;Tl+j;s3|?V!22f)(
zwOPN792oUmTYLcEn(~7T_Dnv?p;_Y|^pw$Fx9Q}u;c#lthhI(pdFA?s177u@<(a$>
z9nWyU^)BQ!Zn&9eIOH1V%dOrBBpg7+IJ*E&<#58A3H8VoonkWppI!4E-V7k%cdvSb
z6mz;!I2B%Cvy{>WUDZZmol&KNPRT2(Mw;hz3rY_y`C1efOZhKFVX>tDyC~?tq{qQ~
zBOF|poN-2Jc5lSu>WYiqw=#fKvs3bw?$=q%0M?>M$!|sPwH~)qaw`0%ELExEitdfD
z+GagK@AZQ90ky@!bMDxClWV!KUojiRe<gDN`JEiR%JlOhuQ=fP8}<S=VDOvN2hHm5
zxZ!bq^;$O%>KDy_2zOSRW%$tRrX<l;z|67VWft?I%l~Aule;gNSxa;i;X_5G0F7fU
zp9UH8ZqMVE7T!YGrzf!)tw6IA{FotU{5k+M4^t<{X2H=NG=p0}_HZe|Y5*O4EqVZ5
z<eb@C5aXPt3ue6Zz{R|t_YQK09+wen-rM3`Wb6o&mN$u6fe>>|`~zUU!C<yy4<#*@
zYr7NgF}oXiV~bs8JwU4OX4F1#|HMv4`oNSfIbZJN!!0>CqU&>(9&$6hIJ*4?W<6r*
zkBq{z<nyR;D$!_I25sRbE=R<dno(i)J!c_IpPwkkHpyyOS#z5#MoAd;Y?VwlU7{^B
zyi<K-Cr6E_9j90-ytB$F8iN+l4|(cQm}cPO4gYEGFtY&C-^rwH^Z*hdV|SDk9MLV;
zX2fQS74a0c*Gc=&5vw9ac+<09vAAhfz_~}!*?inj!jt)Bcz+YdJ<t)BV<RjvS3n-X
zX4eJp#pnfP;^*sZBP?E~#J+e_2Dgz-hi+~00lr73+(uYvAYRk(j;6zvia4ViCdF(c
zEQzRWge7iaBP<(XHOUujgoQ@<Zz8NOM}z3@@ah8_Ug>oQqj5|&yb^2Rw+y?1WjC-?
z`9_o*R`gYpQpwlCb^}Y>#cp7|AVb&<EW3e4pQq>w__dkCx&QG7)=7UnzB{~fZFr^E
zMH^n(^Fez)XwL@~f5WQI3w8Wx&j)3dwC95uEKs;$&j;=Kpu7|Cc|SSR+gGCr{;VrW
ZqSG1v3@e_-$!vr_%c`9j-uvQH_b;K8L%;w4

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin b/htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin
new file mode 100644
index 0000000000000000000000000000000000000000..0a762c8c160e39da6be9fc7c587b76a53e73c74e
GIT binary patch
literal 1780
zcmZuyTWl0n7zTZ-F;NqrHYQ&a6ELYh_(Xg`2<0M;K_p^)J3DiB=X7W0tmn*ZFHiIa
zR0;;u2!aW1xoo-1r9iotise>dmtH}zh0+Txkg&LkVxs@<wp<eDVP?*pbH4xkzyCY`
z1U?Pq&syX}ZSHW_<0fq8hJ6<1IxmnvEl@ap9&?4ZKFJFdPW!?a<tDd1npG}`jtcE@
z6ia0W*DE-*Ib;XC*EXBHfJUx{AymZI5nIMw?qa#LJ&UW%KHKIdM|34h%WN5v?neYa
zeF0YvbF-1=Gg})L*Vq)KjWOxsYg!n!r0e)vMDVR&ZF?vt5Eo%pKgbomd{e?zIESP-
zk7R)Y-W#XxObp$5uzBEbJQ^H9`pMI=)ZM1>9`xS6bN@--@RpuT>_RtePo=rc;uJs_
z5d@ViaS@WGDE6JGhKvz?%7H{GFM}y_(Y}nnkf_i`RJh>^;Yuv$uEDj<BrH)b5fLQL
zv?hmpN@@gIu>>!*n6Et%W3X*MCK$>PQjM|zY@1Xp$iSd|BEyw1B@AX*QYo3uaXzJN
z<mytyVFbLle)bj2u@N5*6B_o6yADZg``%LzE_)oKq7+I0Uk&wu;*tD@Vo~;wM=6nb
z26N>&m`@Y-0Npem*<2SOszx<T!W^=-r_v7OUnI*jo6G`Q09VF_vwRjQ(hmz5w}p|F
ze%_3b<uh$CVWU%OR)Cwzv6w+*VBHX5l5s9)uFC`|N`X=e7a1{QVPB)ow3u+LEb>C%
z4KpPstw9EBQL)ByFW|lNOs#=e5vf<9t*R+p8O;$fIC<EdWU-huU+)OGv~L3Sr2<x^
zLRo~Yi;?1{knh0Vis1U|0<lILGK>aO@hHne6)}&BlC$Ijs$PCoU-ww=1cT}wtLqjp
z%WIYIR3RaFv>0=l#SoEHbmfKYx*9(2BUVKRAd9s`J~!AB!*Z{$LJ7PiRyUd3$;jKt
z0e%p2qXQjL<z*uXiJZHZ`dUwM2zYN-Vx(cL;XWR1ZNQG^-Dn)gaP!@PdxNu4-B5tN
z`!Lk7dt$V?X?!Oh?uu{Uvw!#Ff&7fcm-&ja&N*g@C}s}J9M*1FOnX$EG8XXOjIS-n
z78$Bn9IIH+H&_JWiWny~vpIZ5hH<&(n7NpFEW$FCWOnGo5@CAQ2a^YG`oUY5e!JTF
zE86-x`gh>>BRywtp24{b=X(=*hYntBIo5Rztyhj8ZpVQWN4t~PPvY?98>dg*&ZCAi
zYq?Yr4dIgSWLR-M)rFRk9We8AIs+C{%*dJ6kS3XzJR@utwD}Z)cUzO^E+yhS&L$2W
zn83i*`01{riN=c)rxK%aoa`SPI5?Wz-7^|*>+VeM>OMViVx)C@Yg6*v){etC(%;x}
zqrIc~#Qv`1iI%R$WP5Ys_?fZJ_=V(o{E}=vpJ;4NUZL;X`VL**+ZErLXldWIFNr<L
z)=O>4V_g}cU#PTDC>AD_a?EDGbmigY!AtM6^IjRe0{2|>kZ;>Bi$1v}hdGIydrYCd
zGBta0NrvnkYBR#X%%#hU=q!8GZlY1C=todMU4aCqW(J|P&-IkNA9ts3<7#T~PKxfs
z*V6bSbuWE+FpZAEuGGC7X`D}A$Awffbt`oV8}KmI**`&ZJ*g`XZ~lo3>H8fRN?jT3
zXiMQ<`et88BAwx}kOvhn`ClHkpq~xRk{MrR@_tn%)^FJOJ$_n^irTeUx1wgv$_muf
j)o=O%>wa8;x*Dvi*jSAfwcnw7LtX9a>b&>9n)CX9MQ`KH

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/character-tables.bin b/htdocs/includes/escpos/test/integration/resources/output/character-tables.bin
new file mode 100644
index 0000000000000000000000000000000000000000..f3fb990cea3c56a9631360b2d12cb0e5b64254c6
GIT binary patch
literal 8174
zcmdT}Rdf?k5N#=TaJL*_3)C%}WF<x05U2nxZ7EJErO-kJ3B@_MySux)ySux)yKBpP
zoAeEbulGBj$(g(7-g!H7=gsPB>1<g#o0HD!924IrB~j1^3YJKdQOT#X(mw@3FB*&{
zNmf*IP_U)8wa)*)9f1ac00h@cm8-b9dw6<z`}q3#2S99K)oRsi)FiRaCK_1F{;awo
zp<&_m>NkjpY#0?C(<rualcvp@w`kcajt0s!uyuT!gtm$8+9xG<=$Mk4mfopzm#(&M
z8QpvI?A5zZ-+lrORB2%U0RsmO9x`;;@DU?NjUF?0-1rF-CrzF*b=ve9GiS}7Gj|>h
z45ESa7c5+~c*)Xb%U7&iwR+9kb?Y~5+_ZVi)@|E&?A*0`&)$7B&_V<EA2@jE@R6g(
zj-NPr>hzhj=gwcac<J($tJkjIxOwaLoxAsFpp^#RfAH|p<0ns_J%91?)$2EJ-@X6v
z@zduoU%!3-@$=X3KbeFhO|dfxx2IU7DK;Ao<N;3PPaO1fF!}~cUzPNz=({lbMvcCV
zi+)Z<-(;t6M3wzqjJ{;2FQKBJo6(m81;H~d-6o{Q+Y*uz+X}XHAvqyEEkm%;?&+n;
zqSc;<K@?s{UItNlA^90Z)S8MaiKr4=0Qi%x!k5{CfU%ddl<ieG8fhWmuhp``ycP%l
z!oZ&tb7*u#oT^G@KU{}U1VoUMwnT~s36~ug1p%bN5I>e>RFz*0_>*o&=LuZ-FAn_8
zyq&8A!x+ev&DZTp0><9q6%(p+E(QF#JA7%tkPgq6r!s&cU6l`07BHlf@nOmVhI<yM
zz%WMcbFT;(a_)TG$X&#7!!UB^+7&RGn<@&f(X0~iw@=0rF8-B)zhgAUHNjN@{+f}h
zGOj-E2K*g9imSi61An`Z%4Ssl-~s%JkFseJ*GuHdM3_i}XCg#gt;h>ha9fTyV6?T6
zf^0nT0sapA!}aF*0)Nf^L~@ZqRsVh<K=VJsAJ=Bi9|UCIByl--00__=kemRn<)R)0
zXckBW;PP-01P~9@mJzs$*uVrx+UFy30=TvjMi8LgvWWm(`z#X((0rH(P*M4S1OkW=
zM}>=e6D|S4On}V27_b0_`zt|hz;J&iumXmASyhK&6z-)(UBGZpkRgEKURs0#hI>I2
l1{m%IQ8-|@7erAEqjKxXWEf&yyxX3ve?UC!%Etz|`~{yY7?A(~

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/demo.bin b/htdocs/includes/escpos/test/integration/resources/output/demo.bin
new file mode 100644
index 0000000000000000000000000000000000000000..6b426d91ff0563a2ec43c93217f26a492e8d9396
GIT binary patch
literal 73643
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

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/graphics.bin b/htdocs/includes/escpos/test/integration/resources/output/graphics.bin
new file mode 100644
index 0000000000000000000000000000000000000000..8eeda76d297b88770222784da5f19cd8fe3f0af1
GIT binary patch
literal 9635
zcmeI1F>l;96vrPe;Dj26m91y=a=fuqaP4%%;pnbKrXpz9Gg2ckVB`*m1n|&W>eMky
z=jNkWMLs~jK_Z|-#$J&jD(sy4e~*+zDJfb6om$ec$R8g?Jw85C@2F3XZ-09C%a5k(
zsZyVPPe0K=Os48IR8^Jx6-iZXeb!ZV<8xY7JD)2gkI`LKWo?CU-g3lpk7MSdmG>Fy
zbQJnK*4(~q`}-jF1}yh?`3K)1=1D~zj(3!L?HADv8IR}c9loVI@^bF;Y+Zh*J%i7-
z<)zQVvfTMR>htxJuKY%I`GPwAkJmIZ-t+V^#g)$)QHNn_zx^1jz4oIX9}z{q{3xSC
zpXWIZJG`W&@%mc~Rlf2Z&KxH6+~;4)DDfQda!I4u=UX(5JqO$!P~PD|l*OJy?l50b
zyCOgsK+Bk2BGo#a<7Pr*c12Y+14zU*-{EEeTGn2>f{bw5D4aSj&@HF5;HzmAwgpow
zsA?{`8Ec+%rfUza`N}EmES0=;3Oh?Czc~eymwY?LZyf8ZnlmXF%h9#7xVe<-=&c(-
zYFX8MX`ichZU8%{N6l}Y-a9*PRdee254TmNMjA%fj!mEK0OQw%=tHK*`l&oPev@0d
z<D_LVNb<_blc(=x{VKEfJ9*1m+BY0)F`)j{wI|EwuXqqkd-K|MPv)8B-yKg&%Wn9z
zT%;_qRzTr6SqMAx!sUPVS>@3SVbKz9;&^7bmS}Kn<!hY@A1q_(sfY{53EzostOCQS
z{xJh*vK)wpvsC5imXv+KP~Q+Z##Vx6L{lt_CD8($3&#aB<}@vYaamG?vYq!Sc*?iC
z5n4X%@c|eQLbCE9vnVh@X^1}}(VILLJ1!v^iQL+q`A|4&<bxhZ!ghe%KFYX%lIJt4
zjP;>4Uvjy;muEe>bYj~}k#CAJT$Js9fMU$-p2tR!SxRKom`WH8bu@Oo#dgGeVHpaG
z@2SEuzds>HpKLWWwmfEwadHejM>Vrex3Fb~oZEv{4vn}URc#G&Q8|S%cmw@drXIpH
zqX-%PdG1gsi1k;Q>l+@x0x%xO$<Um$+?o;HR3-Bo+S_FPXD+I^Dr9!nTXt^RR!9lq
z)E-Sg|LXL?<MWfv<lf_pJNx@}jI|eHtj1iLeLxIvt3HU~2X&JByBuOH*{Ga-kr|K2
zVBe)jJwC!p^5r4Mf`MdLLk`nnuVT(PLo&i4#&R)Lh_ReogcvKtSVQ)O5M#jz|7wi&
z&Dpo7y#Pz?g+na6@!$=G_$mZgwKecdBOGFdLo8FTi2Bfqe@=3$`O0xP#Ikk?hgdJz
z5aAFj9AfeN6s~|D&Jxi5_Ybk|ot&Td0<66dVA*{USIrI)POut#ga9jiCB#=mw<79*
zDg;;(Q8r%<!&gEHsOqEW@RcxpCH&uhCA@pGc_2qvle34D`>W07^!}sCdb3)uHjmC$
M5AW>X{`!mPPivkA#sB~S

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/interface.bin b/htdocs/includes/escpos/test/integration/resources/output/interface.bin
new file mode 100644
index 00000000000..729d4f4481b
--- /dev/null
+++ b/htdocs/includes/escpos/test/integration/resources/output/interface.bin
@@ -0,0 +1,2 @@
+@Hello World!
+VA
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z b/htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z
new file mode 100644
index 0000000000000000000000000000000000000000..f89eb5d2115e388de90586ff30d80a47fc0ad083
GIT binary patch
literal 17081
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
baI$Cav;BIBA!wfEw|@W6|LqUE=-dSWqat^g

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/qr-code.bin b/htdocs/includes/escpos/test/integration/resources/output/qr-code.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a1e687f151c8f8db633da3fa63fcc0d67fbb6671
GIT binary patch
literal 1551
zcmbW1%}>HG6u_t8We4M(m^^M6J#6Dcy@^WVK@6zzUbhOBwVhq3gTLN4zC;<Yx=Wk9
z^q1e>SLLcwb^4Fs%YZ^axwI=)>$o;5TW;ISE+xyoDb3D~gXf{;_MB%LYbFNZdi7bT
z?{sCXA!a-ZDbSQ;r)^ir9>$GXPlPWaXW&zz6%7z(p`3F|Gyy757!7vWo@TZVYBrj!
z^NY*vx5ckKB%CVd+x9m1DVe<b0eu?`+50HuLPj4d*2(8rI-dNFEXeIJ8WK?$Zx#F&
z_-iJJ8e`h4PDd%Ju&PQ?Uo$CoC2CVy|8n4db6Q;VD9q_@=6EKY{$@_rn}vPurfKW3
zl!n;G6PlN>teJ5hw$8y10bHnYCKyln$-3me8OwupM3J#v(WyfXo0TM?&e18G=`?b5
z4$KhE97Hy8CJA<O7)OST7FLO*^D51jA;)DHt~7vavIudRcC+{3{;y)o_g+rD>Lw;#
k<|_&F<!;x6#08y1kyM%nAO(;xgh(-=sfx3fcxjiu0iptB6#xJL

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin b/htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a4ed9c3530402d4cd54e0f00c07bdd3af9a7ed4f
GIT binary patch
literal 9579
zcmeI2L2DaF6vy9Y4-2|X>8YT^J0>~w5QL=Ip$*1cQ(OqxX~7|PHI^$;+biUCaG-b<
zbkNsY<Aaa+2p!`?E`{!K4a>g1nc0z4RhHU7dT3|(d)C_d?ac6hZ+6UB)o-dT=fRgd
zpFgbk>W<TR?ED6{SO-3>0|726xg0-U0->UoL0HJX{(VYKP7ZxnIhPHVA``3=CP%Cj
z)(PW)x!Rogn@(h!TjJOMkctJMfLO3m27V5VHXZk-fGi$t`eOX{#ni!!#C|Pk>xBS`
z`hakY$!44yirQVwNsRVY#6gS$aOrxBBEZa0ZkBtZ@UUQr4q}q~iKG(5G@xC(jF2bJ
zy=0SWmd0-8Cz(eSp*Tu|iz#Z8C8U6fV3@LNMP*DBZW;^<)0b>dK-K;*^{!=<-P9Ag
zn+3#_BdT7ABKafXUCZ59QO*qI72ppfbtSwM6QTt5^=AsvL!l^kCEQfHG9)USrCiJ=
zRE&2}fcb>-aX7y(2#N{i;pIF^&Q?=u_7LCPK|wrrLVzcf6Em}?zJQD+NmuWnJn<D9
z_{v)qq12_mGM31`CK2+44kAT67-sAulOxKg6ZLK!Z8t3#rNwQ*a&!tx1Dc{+1d6&D
zQx4{oT$3!M)KXa}`<i4Ss9aSUoy&|?xk?!=sYymdOnINu0%7mf>Ie$ZtAnUuvO3s6
zW`qyyf~HMMi4s&ve+DMM<VRI#)}|0FOF%zm7OKy(veej$xxdW%H5dAetCpJYfVpd3
zwN4lZ%=J^`#C=Dgmu=i%fp|E~S6J%F3#75E$E$Y3NpX~KtgHZzsKF=dvapnO!sZ11
zb!u0Kc{5ojtP>x*chEjGd7H?6XwD8}cEb5r<Nf?rbJtSV3FCmd+MM_=IYB2>-e6X4
z0!BL8Oh74l(p1V*rzfh`l%GN=0dx$f#ZoZRRFFZb6apikPAW=iDy9PttqfwLAO|B&
z$s;?hoQ|7H#dO+NN>TKmGCHzTDjY0DM}1>ys=(ot+yY5Xf$xk88FtL$t0|50m^94e
zOCwEX!S7Rgp9Q3=Ecjrgsno}X(v)CylCwaXN<3UBO$}VUQw}w03LIQ0MNzdt=c*Op
zmxbC;tpK0R(-#2KlJ47L9k333yaV*Ln0rufR#*A<S?j2G*xqgRBfb;u*DBRj*z1Hn
z{vxdLwPvkSsct)aTRYo({P~Ml-#`C$n{Gh01$3MLv+_tjS&qlMQTvELY%J_ytyZsB
zwvNN7)9&-A(>?xaA<p@e+IqdR7ap}W+&(;MFMgt-M&JkC<JO^`(qf*k)z;RPBd0$`
zVMGrtFO6pHYxxXRw)kQAnx2VTXG<Sz)SlES7X0PxD35q!t=6OtSE0IpkG|scveP>L
znZFHB`9av{CltG$bgC6i$F}kvwMG5bzHI7*r~Q-1oWkBBgWhycx)E>dJgB`6k1Evf
uZg{-kddr_i9UdO=tzN%-$eZ=XI<GgMtv`L%T<1URRvx_Ca;v@i#@Qc?v`v`+

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/integration/resources/output/text-size.bin b/htdocs/includes/escpos/test/integration/resources/output/text-size.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4d36038e463c3bd08e9d1298813557cf5dcaac0d
GIT binary patch
literal 368
zcmY+<O-}+b5P)G44wAhYkDEzmG%<QHd@Nv0OfY!x;7#Seuw}bgx7ZfT^6Qy&8<q3C
z^Guu0(pgHqWG?f%6evYiN{83ztHQ}7r4CSM0CYYCx*P$GGN9)%(8mO5Jq7aj-285b
zCDgTQ@TQd>v)hMO>9TUc%2ib6th}+ZV#S^)@eM5#$Umje%7B$&R5Dh^tV~#$w#q`7
z2J74y?a_(7i}%morNHl9wfe**k7``&J#KbiTZ{Tf7<4>V`Jur=mv`Y)0pk1OKhu8^
fN@?`ksDeWFnwwHshg)rJwNxjy4|Ni2SUh!)7zJM*

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/phpunit.xml b/htdocs/includes/escpos/test/phpunit.xml
new file mode 100644
index 00000000000..f9a6579cf45
--- /dev/null
+++ b/htdocs/includes/escpos/test/phpunit.xml
@@ -0,0 +1,16 @@
+<phpunit bootstrap="bootstrap.php"
+timeoutForSmallTests="1"
+timeoutForMediumTests="10"
+timeoutForLargeTests="60"
+verbose="true"
+strict="true"
+>
+  <testsuites>
+    <testsuite name="unit">
+      <directory>unit</directory>
+    </testsuite>
+    <testsuite name="integration">
+      <directory>integration</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php b/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
new file mode 100644
index 00000000000..b3e72452a9f
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Test that all sub-classes of AbstractCapabilityProfile
+ * are creating data in the right format.
+ */
+class EscposCapabilityProfileTest extends PHPUnit_Framework_TestCase {
+	private $profiles;
+	private $checklist;
+	
+	function setup() {
+		$this -> profiles = array('DefaultCapabilityProfile', 'EposTepCapabilityProfile', 'SimpleCapabilityProfile', 'StarCapabilityProfile', 'P822DCapabilityProfile');
+		$this -> checklist = array();
+		foreach($this -> profiles as $profile) {
+			$this-> checklist[] = $profile::getInstance();
+		}
+	}	
+	
+	function testSupportedCodePages() {
+		foreach($this -> checklist as $obj) {
+			$check = $obj -> getSupportedCodePages();
+			$this -> assertTrue(is_array($check) && isset($check[0]) && $check[0] == 'CP437');
+			$custom = $obj -> getCustomCodePages();
+			foreach($check as $num => $page) {
+				$this -> assertTrue(is_numeric($num) && ($page === false || is_string($page)));
+				if($page === false || strpos($page, ":") === false) {
+					continue;
+				}
+				$part = explode(":", $page);
+				if(!array_shift($part) == "custom") {
+					continue;
+				}
+				$this -> assertTrue(isset($custom[implode(":", $part)]));
+			}
+		}
+	}
+	
+	function testCustomCodePages() {
+		foreach($this -> checklist as $obj) {
+			$check = $obj -> getCustomCodePages();
+			$this -> assertTrue(is_array($check));
+			foreach($check as $name => $customMap) {
+				$this -> assertTrue(is_string($name));
+				$this -> assertTrue(is_string($customMap) && mb_strlen($customMap, 'UTF-8') == 128);
+			}
+		}
+	}
+	
+	function testSupportsBitImage() {
+		foreach($this -> checklist as $obj) {
+			$check = $obj -> getSupportsBitImage();
+			$this -> assertTrue(is_bool($check));
+		}
+	}
+	
+	function testSupportsGraphics() {
+		foreach($this -> checklist as $obj) {
+			$check = $obj -> getSupportsGraphics();
+			$this -> assertTrue(is_bool($check));
+		}
+	}
+	
+	function testSupportsQrCode() {
+		foreach($this -> checklist as $obj) {
+			$check = $obj -> getSupportsQrCode();
+			$this -> assertTrue(is_bool($check));
+		}
+	}
+}
+?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/EscposImageTest.php b/htdocs/includes/escpos/test/unit/EscposImageTest.php
new file mode 100644
index 00000000000..f152f400a2f
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/EscposImageTest.php
@@ -0,0 +1,235 @@
+<?php
+class EscposImageTest extends PHPUnit_Framework_TestCase {
+	/**
+	 * Checking loading of an empty image - requires no libraries
+	 */
+	public function testNoLibrariesBlank() {
+		$this -> loadAndCheckImg(null, false, false, 0, 0, "");
+	}
+
+	/**
+	 * BMP handling not yet implemented, but these will use
+	 * a native PHP bitmap reader.
+	 * This just tests that they are not being passed on to another library.
+	 */
+	public function testBmpBadFilename() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg('not a real file.bmp', false, false, 1, 1, "\x80");
+	}
+
+	public function testBmpBlack() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg("canvas_black.bmp", false, false, 0, 0, "\x80");
+	}
+
+	public function testBmpBlackWhite() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg("black_white.bmp", false, false, 0, 0, "\xc0\x00");
+	}
+
+	public function testBmpWhite() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg("canvas_white.bmp", false, false, 0, 0, "\x00");
+	}
+
+	/**
+	 * GD tests - Load tiny images and check how they are printed.
+	 * These are skipped if you don't have gd.
+	 */
+	public function testGdBadFilename() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg('not a real file.png', true, false, 1, 1, "\x80");
+	}
+
+	public function testGdBlack() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('canvas_black.' . $format, true, false, 1, 1, "\x80");
+		}
+	}
+
+	public function testGdBlackTransparent() {
+		foreach(array('png', 'gif') as $format) {
+			$this -> loadAndCheckImg('black_transparent.' . $format, true, false, 2, 2, "\xc0\x00");
+		}
+	}
+
+	public function testGdBlackWhite() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('black_white.' . $format, true, false, 2, 2, "\xc0\x00");
+		}
+	}
+
+	public function testGdWhite() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('canvas_white.' . $format, true, false, 1, 1, "\x00");
+		}
+	}
+
+	/**
+	 * Imagick tests - Load tiny images and check how they are printed
+	 * These are skipped if you don't have imagick
+	 */
+	public function testImagickBadFilename() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckImg('not a real file.png', false, true, 1, 1, "\x80");
+	}
+
+	public function testImagickBlack() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('canvas_black.' . $format, false, true, 1, 1, "\x80");
+		}
+	}
+
+	public function testImagickBlackTransparent() {
+		foreach(array('png', 'gif') as $format) {
+			$this -> loadAndCheckImg('black_transparent.' . $format, false, true, 2, 2, "\xc0\x00");
+		}	
+	}
+
+	public function testImagickBlackWhite() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('black_white.' . $format, false, true, 2, 2, "\xc0\x00");
+		}
+	}
+
+	public function testImagickWhite() {
+		foreach(array('png', 'jpg', 'gif') as $format) {
+			$this -> loadAndCheckImg('canvas_white.' . $format, false, true, 1, 1, "\x00");
+		}		
+	}
+
+	/**
+	 * Mixed test - Same as above, but confirms that each tiny image can be loaded
+	 * under any supported library configuration with the same results.
+	 * These are skipped if you don't have gd AND imagick
+	 */
+	public function testLibraryDifferences() {
+		if(!EscposImage::isGdLoaded() || !EscposImage::isImagickLoaded()) {
+			$this -> markTestSkipped("both gd and imagick plugin are required for this test");
+		}
+		$inFile = array('black_white.png', 'canvas_black.png', 'canvas_white.png');
+		foreach($inFile as $fn) {
+			// Default check
+			$im = new EscposImage(dirname(__FILE__) . "/resources/$fn");
+			$width = $im -> getWidth();
+			$height = $im -> getHeight();
+			$data = $im -> toRasterFormat();
+			// Gd check
+			$this -> loadAndCheckImg($fn, true, false, $width, $height, $data);
+			// Imagick check
+			$this -> loadAndCheckImg($fn, false, true, $width, $height, $data);
+		}
+	}
+
+	/**
+	 * PDF tests - load tiny PDF and check for well-formedness
+	 * These are also skipped if you don't have imagick
+	 * @medium
+	 */
+	public function testPdfAllPages() {
+		$this -> loadAndCheckPdf('doc.pdf', null, 1, 1, array("\x00", "\x80"));
+	}
+
+	public function testPdfBadFilename() {
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckPdf('not a real file', null, 1, 1, array());
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testPdfBadRange() {
+		// Start page is after end page.
+		$this -> setExpectedException('Exception');
+		$this -> loadAndCheckPdf('doc.pdf', array(1, 0), 1, 1, array("\x00", "\x80"));
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testPdfFirstPage() {
+		$this -> loadAndCheckPdf('doc.pdf', array(0, 0), 1, 1, array("\x00"));
+	}
+	
+	/**
+	 * @medium
+	 */
+	public function testPdfMorePages() {
+		$this -> loadAndCheckPdf('doc.pdf', array(1, 20), 1, 1, array("\x80"));
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testPdfSecondPage() {
+		$this -> loadAndCheckPdf('doc.pdf', array(1, 1), 1, 1, array("\x80"));
+	}
+
+	/**
+	 * @medium
+	 */
+	public function testPdfStartPastEndOfDoc() {
+		// Doc only has pages 0 and 1, can't start reading from 2.
+		$this -> markTestIncomplete("Test needs revising- produces output due to apparent imagick bug.");
+		$this -> setExpectedException('ImagickException');
+		$this -> loadAndCheckPdf('doc.pdf', array(2, 3), 1, 1, array());
+	}
+
+	/**
+	 * Load an EscposImage with (optionally) certain libraries disabled and run a check.
+	 */
+	private function loadAndCheckImg($fn, $gd, $imagick, $width, $height, $rasterFormat = null) {
+		$img = $this -> getMockImage($fn === null ? null : dirname(__FILE__) . "/resources/$fn", $gd, $imagick);
+		$this -> checkImg($img, $width, $height, $rasterFormat);
+	}
+
+	/**
+	 * Same as above, loading document and checking pages against some expected values.
+	 */
+	private function loadAndCheckPdf($fn, array $range = null, $width, $height, array $rasterFormat = null) {
+		if(!EscposImage::isImagickLoaded()) {
+			$this -> markTestSkipped("imagick plugin required for this test");
+		}
+		$pdfPages = EscposImage::loadPdf(dirname(__FILE__) . "/resources/$fn", $width, $range);
+		$this -> assertTrue(count($pdfPages) == count($rasterFormat), "Got back wrong number of pages");
+		foreach($pdfPages as $id => $img) {
+			$this -> checkImg($img, $width, $height, $rasterFormat[$id]);
+		}
+	}
+
+	/**
+	 * Check image against known width, height, output.
+	 */
+	private function checkImg(EscposImage $img, $width, $height, $rasterFormat = null) {
+		if($rasterFormat === null) {
+			echo "\nImage was: " . $img -> getWidth() . "x" . $img -> getHeight() . ", data \"" . friendlyBinary($img -> toRasterFormat()) . "\"";
+		}
+		$this -> assertTrue($img -> getHeight() == $height);
+		$this -> assertTrue($img -> getWidth() == $width);
+		$this -> assertTrue($img -> toRasterFormat() == $rasterFormat);
+	}
+
+	/**
+	 * Load up an EsposImage with given libraries disabled or enabled. Marks the test
+	 * as skipped if you ask for a library which is not loaded.
+	 */
+	private function getMockImage($path, $gd, $imagick) {
+		/* Sanity checks */
+		if($gd && !EscposImage::isGdLoaded()) {
+			$this -> markTestSkipped("gd plugin required for this test");
+		}
+		if($imagick && !EscposImage::isImagickLoaded()) {
+			$this -> markTestSkipped("imagick plugin required for this test");
+		}
+		$stub = $this -> getMockBuilder('EscposImage')
+				-> setMethods(array('isGdSupported', 'isImagickSupported'))
+				-> disableOriginalConstructor()
+				-> getMock();
+		$stub -> method('isGdSupported')
+				-> willReturn($gd);
+		$stub -> method('isImagickSupported')
+				-> willReturn($imagick);
+		$stub -> __construct($path);
+		return $stub;
+	}
+}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php b/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
new file mode 100644
index 00000000000..2bbdb34c20c
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Example strings are pangrams using different character sets, and are
+ * testing correct code-table switching.
+ * 
+ * When printed, they should appear the same as in this source file.
+ * 
+ * Many of these test strings are from:
+ * - http://www.cl.cam.ac.uk/~mgk25/ucs/examples/quickbrown.txt
+ * - http://clagnut.com/blog/2380/ (mirrored from the English Wikipedia)
+ */
+class EscposPrintBufferTest extends PHPUnit_Framework_TestCase {
+	protected $buffer;
+	protected $outputConnector;
+	
+	protected function setup() {
+		$this -> outputConnector = new DummyPrintConnector();
+		$printer = new Escpos($this -> outputConnector);
+		$this -> buffer = $printer -> getPrintBuffer();
+	}
+	
+	protected function checkOutput($expected = null) {
+		/* Check those output strings */
+		$outp = $this -> outputConnector -> getData();
+		if($expected === null) {
+			echo "\nOutput was:\n\"" . friendlyBinary($outp) . "\"\n";
+		}
+		$this -> assertEquals($expected, $outp);
+	}
+
+	protected function tearDown() {
+		$this -> outputConnector -> finalize();
+	}
+
+	public function testRawTextNonprintable() {
+		$this -> buffer -> writeTextRaw("Test" . Escpos::ESC . "v1\n");
+		$this -> checkOutput("\x1b@Test?v1\x0a"); // ASCII ESC character is substituted for '?'
+	}
+
+	public function testDanish() {
+		$this -> buffer -> writeText("Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.\n");
+		$this -> checkOutput("\x1b@Quizdeltagerne spiste jordb\x91r med fl\x1bt\x02\x9bde, mens cirkusklovnen Wolther spillede p\x86 xylofon.\x0a");
+	}
+
+	public function testGerman() {
+		$this -> buffer -> writeText("Falsches Üben von Xylophonmusik quält jeden größeren Zwerg.\n");
+		$this -> checkOutput("\x1b@Falsches \x9aben von Xylophonmusik qu\x84lt jeden gr\x94\xe1eren Zwerg.\x0a");
+	}
+
+	public function testGreek() {
+		$this -> buffer -> writeText("Ξεσκεπάζω την ψυχοφθόρα βδελυγμία");
+		$this -> checkOutput("\x1b@\x1bt\x0b\xbd\xde\xec\xe4\xde\xea\x9b\xe0\xfa \xee\xe1\xe7 \xf6\xf2\xf4\xe9\xf3\xe2\xa2\xeb\xd6 \xd7\xdd\xde\xe5\xf2\xd8\xe6\x9f\xd6");
+	}
+	
+	public function testGreekWithDiacritics() {
+		// This is a string which is known to be un-printable in ESC/POS (the grave-accented letters are not in any code page),
+		// so we are checking the substitution '?' for unknown characters.
+		$this -> buffer -> writeText("Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο.\n");
+		$this -> checkOutput("\x1b@\xe2\xe0\x1bt\x0b\xe0\x9d\xde\xed \xe4\xd6? \xe6\xf2\xeb\xee\xe3?\xed \xdd?\xe7 \xe2? \xd7\xeb? \xea\xe3? \xec\xee? \xf4\xeb\xf2\xec\xd6\xf3? \xe8\x9d\xf3\xfa\xee\xe9.\x0a");
+	}
+
+	public function testEnglish() {
+		$this -> buffer -> writeText("The quick brown fox jumps over the lazy dog.\n");
+		$this -> checkOutput("\x1b@The quick brown fox jumps over the lazy dog.\n");
+	}
+
+	public function testSpanish() {
+		// This one does not require changing code-pages at all, so characters are just converted from Unicode to CP437.
+		$this -> buffer -> writeText("El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n");
+		$this -> checkOutput("\x1b@El ping\x81ino Wenceslao hizo kil\xa2metros bajo exhaustiva lluvia y fr\xa1o, a\xa4oraba a su querido cachorro.\x0a");
+	}
+
+	public function testFrench() {
+		$this -> buffer -> writeText("Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ.\n");
+		$this -> checkOutput("\x1b@Le c\x1bt\x10\x9cur d\xe9\xe7u mais l'\xe2me plut\xf4t na\xefve, Lou\xffs r\xeava de crapa\xfcter en cano\xeb au del\xe0 des \xeeles, pr\xe8s du m\xe4lstr\xf6m o\xf9 br\xfblent les nov\xe6.\x0a");
+	}
+
+	public function testIrishGaelic() {
+		// Note that some letters with diacritics cannot be printed for Irish Gaelic text, so text may need to be simplified.
+		$this -> buffer -> writeText("D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh.\n");
+		$this -> checkOutput("\x1b@D'fhuascail \x1bt\x02\xd6osa, \xe9rmhac na h\xe0ighe Beannaithe, p\xa2r \x90ava agus \xb5dhaimh.\x0a");
+	}
+
+	public function testHungarian() {
+		$this -> buffer -> writeText("Árvíztűrő tükörfúrógép.\n");
+		$this -> checkOutput("\x1b@\x1bt\x02\xb5rv\xa1zt\x1bt\x12\xfbr\x8b t\x81k\x94rf\xa3r\xa2g\x82p.\x0a");
+	}
+	
+	public function testIcelandic() {
+		$this -> buffer -> writeText("Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa.");
+		$this -> checkOutput("\x1b@K\x91mi n\x1bt\x02\xec \x94xi h\x82r ykist \xe7j\xa2fum n\xa3 b\x91\xd0i v\xa1l og \xa0drepa.");
+	}
+
+	public function testJapaneseHiragana() {
+		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
+		$this -> buffer -> writeText(implode("\n", array("いろはにほへとちりぬるを",  " わかよたれそつねならむ", "うゐのおくやまけふこえて",  "あさきゆめみしゑひもせす")) . "\n");
+		$this -> checkOutput();
+	}
+
+	public function testJapaneseKatakana() {
+		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
+		$this -> buffer -> writeText(implode("\n", array("イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム", "ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン")) . "\n");
+		$this -> checkOutput("\x1b@\x1bt\x01\xb2\xdb\xca\xc6\xce\xcd\xc4 \xc1\xd8\xc7\xd9\xa6 \xdc\xb6\xd6\xc0\xda\xbf \xc2\xc8\xc5\xd7\xd1\x0a\xb3\xb2\xc9\xb5\xb8\xd4\xcf \xb9\xcc\xba\xb4\xc3 \xb1\xbb\xb7\xd5\xd2\xd0\xbc \xb4\xcb\xd3\xbe\xbd\xdd\x0a");
+	}
+
+	public function testJapaneseKataKanaHalfWidth() {
+		$this -> buffer -> writeText(implode("\n", array("ｲﾛﾊﾆﾎﾍﾄ ﾁﾘﾇﾙｦ ﾜｶﾖﾀﾚｿ ﾂﾈﾅﾗﾑ", "ｳｲﾉｵｸﾔﾏ ｹﾌｺｴﾃ ｱｻｷﾕﾒﾐｼ ｴﾋﾓｾｽﾝ")) . "\n");
+		$this -> checkOutput("\x1b@\x1bt\x01\xb2\xdb\xca\xc6\xce\xcd\xc4 \xc1\xd8\xc7\xd9\xa6 \xdc\xb6\xd6\xc0\xda\xbf \xc2\xc8\xc5\xd7\xd1\x0a\xb3\xb2\xc9\xb5\xb8\xd4\xcf \xb9\xcc\xba\xb4\xc3 \xb1\xbb\xb7\xd5\xd2\xd0\xbc \xb4\xcb\xd3\xbe\xbd\xdd\x0a");
+	}
+	
+	public function testLatvian() {
+		$this -> buffer -> writeText("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus.\n");
+		$this -> checkOutput("\x1b@Gl\x1bt!\x83\xd8\xd5\xe9\xd7\xeca r\xd7\xe9\x8c\xd5i dz\x89rum\x83 \xd1iepj Baha koncertfl\x8c\x85e\xebu v\x83kus.\x0a");
+	}
+
+	public function testPolish() {
+		$this -> buffer -> writeText("Pchnąć w tę łódź jeża lub ośm skrzyń fig.\n");
+		$this -> checkOutput("\x1b@Pchn\x1bt\x12\xa5\x86 w t\xa9 \x88\xa2d\xab je\xbea lub o\x98m skrzy\xe4 fig.\x0a");
+	}
+
+	public function testRussian() {
+		$this -> buffer -> writeText("В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!\n");
+		$this -> checkOutput("\x1b@\x1bt\x11\x82 \xe7\xa0\xe9\xa0\xe5 \xee\xa3\xa0 \xa6\xa8\xab \xa1\xeb \xe6\xa8\xe2\xe0\xe3\xe1? \x84\xa0, \xad\xae \xe4\xa0\xab\xec\xe8\xa8\xa2\xeb\xa9 \xed\xaa\xa7\xa5\xac\xaf\xab\xef\xe0!\x0a");
+	}
+
+	public function testThai() {
+		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
+		$this -> buffer -> writeText("นายสังฆภัณฑ์ เฮงพิทักษ์ฝั่ง ผู้เฒ่าซึ่งมีอาชีพเป็นฅนขายฃวด ถูกตำรวจปฏิบัติการจับฟ้องศาล ฐานลักนาฬิกาคุณหญิงฉัตรชฎา ฌานสมาธิ\n"); // Quotation from Wikipedia
+		$this -> checkOutput();
+	}
+
+	public function testTurkish() {
+		$this -> buffer -> writeText("Pijamalı hasta, yağız şoföre çabucak güvendi.\n");
+		$this -> checkOutput("\x1b@Pijamal\x1bt\x02\xd5 hasta, ya\x1bt\x0d\xa7\x8dz \x9fof\x94re \x87abucak g\x81vendi.\x0a");
+	}
+	
+	public function testArabic() {
+		$this -> markTestIncomplete("Right-to-left text not yet supported.");
+		$this -> buffer -> writeText("صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ" . "\n"); // Quotation from Wikipedia
+		$this -> checkOutput();
+	}
+	
+	public function testHebrew() {
+		// RTL text is more complex than the above.
+		$this -> markTestIncomplete("Right-to-left text not yet supported.");
+		$this -> buffer -> writeText("דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה" . "\n");
+		$this -> checkOutput();
+	}
+}
+
diff --git a/htdocs/includes/escpos/test/unit/EscposTest.php b/htdocs/includes/escpos/test/unit/EscposTest.php
new file mode 100644
index 00000000000..6fd0bd7d204
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/EscposTest.php
@@ -0,0 +1,765 @@
+<?php
+class EscposTest extends PHPUnit_Framework_TestCase {
+	protected $printer;
+	protected $outputConnector;
+
+	protected function setup() {
+		/* Print to nowhere- for testing which inputs are accepted */
+		$this -> outputConnector = new DummyPrintConnector();
+		$this -> printer = new Escpos($this -> outputConnector);
+	}
+
+	protected function checkOutput($expected = null) {
+		/* Check those output strings */
+		$outp = $this -> outputConnector -> getData();
+		if($expected === null) {
+			echo "\nOutput was:\n\"" . friendlyBinary($outp) . "\"\n";
+		}
+		$this -> assertEquals($expected, $outp);
+	}
+
+	protected function tearDown() {
+		$this -> outputConnector -> finalize();
+	}
+	
+	protected function requireGraphicsLibrary() {
+		if(!EscposImage::isGdLoaded() && !EscposImage::isImagickLoaded()) {
+			// If the test is about to do something which requires a library,
+			// something must throw an exception.
+			$this -> setExpectedException('Exception');
+		}
+	}
+
+    public function testInitializeOutput() {
+		$this -> checkOutput("\x1b\x40");
+    }
+
+    public function testTextStringOutput() {
+		$this -> printer -> text("The quick brown fox jumps over the lazy dog\n");
+		$this -> checkOutput("\x1b@The quick brown fox jumps over the lazy dog\n");
+    }
+
+    public function testTextDefault() {
+		$this -> printer -> text();
+		$this -> checkOutput("\x1b@");
+    }
+
+    public function testTextString() {
+		$this -> printer -> text("String");
+		$this -> printer -> text(123);
+		$this -> printer -> text();
+		$this -> printer -> text(null);
+		$this -> printer -> text(1.2);
+		$this -> printer -> text(new FooBar("FooBar"));
+		$this -> checkOutput("\x1b@String1231.2FooBar");
+    }
+
+    public function testTextObject() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> text(new DateTime());
+	}
+
+    public function testFeedDefault() {
+		$this -> printer -> feed();
+		$this -> checkOutput("\x1b@\x0a");
+    }
+
+    public function testFeed3Lines() {
+		$this -> printer -> feed(3);
+		$this -> checkOutput("\x1b@\x1bd\x03");
+    }
+
+    public function testFeedZero() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feed(0);
+    }
+
+    public function testFeedNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feed("ab");
+    }
+
+    public function testFeedTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feed(256);
+	}
+
+	/* Print mode */
+    public function testSelectPrintModeDefault() {
+		$this -> printer -> selectPrintMode();
+		$this -> checkOutput("\x1b@\x1b!\x00");
+    }
+
+	public function testSelectPrintModeAcceptedValues() {
+		/* This iterates over a bunch of numbers, figures out which
+           ones contain invalid flags, and checks that the driver
+           rejects those, but accepts the good inputs */
+		
+		for($i = -1; $i <= 256; $i++) {
+			$invalid = ($i < 0) || ($i > 255) || (($i & 2) == 2) || (($i & 4) == 4) || (($i & 64) == 64);
+			$failed = false;
+			try {
+				$this -> printer -> selectPrintMode($i);
+			} catch(Exception $e) {
+				$failed = true;
+			}
+			$this -> assertEquals($failed, $invalid);
+		}
+    }
+
+	/* Underline */
+    public function testSetUnderlineDefault() {
+		$this -> printer -> setUnderline();
+		$this -> checkOutput("\x1b@\x1b-\x01");
+    }
+
+    public function testSetUnderlineOff() {
+		$this -> printer -> setUnderline(Escpos::UNDERLINE_NONE);
+		$this -> checkOutput("\x1b@\x1b-\x00");
+    }
+
+    public function testSetUnderlineOn() {
+		$this -> printer -> setUnderline(Escpos::UNDERLINE_SINGLE);
+		$this -> checkOutput("\x1b@\x1b-\x01");
+    }
+
+    public function testSetUnderlineDbl() {
+		$this -> printer -> setUnderline(Escpos::UNDERLINE_DOUBLE);
+		$this -> checkOutput("\x1b@\x1b-\x02");
+    }
+
+    public function testSetUnderlineAcceptedValues() {
+		$this -> printer -> setUnderline(0);
+		$this -> printer -> setUnderline(1);
+		$this -> printer -> setUnderline(2);
+		/* These map to 0 & 1 for interchangeability with setEmphasis */
+		$this -> printer -> setUnderline(true);
+		$this -> printer -> setUnderline(false);
+		$this -> checkOutput("\x1b@\x1b-\x00\x1b-\x01\x1b-\x02\x1b-\x01\x1b-\x00");
+	}
+
+    public function testSetUnderlineTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setUnderline(3);
+	}
+
+    public function testSetUnderlineNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setUnderline(-1);
+	}
+
+    public function testSetUnderlineNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setUnderline("Hello");
+	}
+
+	/* Emphasis */
+    public function testSetEmphasisDefault() {
+		$this -> printer -> setEmphasis();
+		$this -> checkOutput("\x1b@\x1bE\x01");
+    }
+
+    public function testSetEmphasisOn() {
+		$this -> printer -> setEmphasis(true);
+		$this -> checkOutput("\x1b@\x1bE\x01");
+    }
+
+    public function testSetEmphasisOff() {
+		$this -> printer -> setEmphasis(false);
+		$this -> checkOutput("\x1b@\x1bE\x00");
+    }
+
+    public function testSetEmphasisNonBoolean() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setEmphasis(7);
+	}
+
+	/* Double strike */
+    public function testSetDoubleStrikeDefault() {
+		$this -> printer -> setDoubleStrike();
+		$this -> checkOutput("\x1b@\x1bG\x01");
+    }
+
+    public function testSetDoubleStrikeOn() {
+		$this -> printer -> setDoubleStrike(true);
+		$this -> checkOutput("\x1b@\x1bG\x01");
+    }
+
+    public function testSetDoubleStrikeOff() {
+		$this -> printer -> setDoubleStrike(false);
+		$this -> checkOutput("\x1b@\x1bG\x00");
+    }
+
+    public function testSetDoubleStrikeNonBoolean() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setDoubleStrike(4);
+	}
+
+	/* Font */
+	public function testSetFontDefault() {
+		$this -> printer -> setFont();
+		$this -> checkOutput("\x1b@\x1bM\x00");
+	}
+
+	public function testSetFontAcceptedValues() {
+		$this -> printer -> setFont(Escpos::FONT_A);
+		$this -> printer -> setFont(Escpos::FONT_B);
+		$this -> printer -> setFont(Escpos::FONT_C);
+		$this -> checkOutput("\x1b@\x1bM\x00\x1bM\x01\x1bM\x02");
+	}
+
+	public function testSetFontNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setFont(-1);
+	}
+
+
+	public function testSetFontTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setFont(3);
+	}
+
+	public function testSetFontNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setFont('hello');
+	}
+
+	/* Justification */
+	public function testSetJustificationDefault() {
+		$this -> printer -> setJustification();
+		$this -> checkOutput("\x1b@\x1ba\x00");
+	}
+
+	public function testSetJustificationLeft() {
+		$this -> printer -> setJustification(Escpos::JUSTIFY_LEFT);
+		$this -> checkOutput("\x1b@\x1ba\x00");
+	}
+
+	public function testSetJustificationRight() {
+		$this -> printer -> setJustification(Escpos::JUSTIFY_RIGHT);
+		$this -> checkOutput("\x1b@\x1ba\x02");
+	}
+
+	public function testSetJustificationCenter() {
+		$this -> printer -> setJustification(Escpos::JUSTIFY_CENTER);
+		$this -> checkOutput("\x1b@\x1ba\x01");
+	}
+
+	public function testSetJustificationNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setJustification(-1);
+	}
+
+
+	public function testSetJustificationTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setFont(3);
+	}
+
+	public function testSetJustificationNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setJustification('hello');
+	}
+
+	/* Reverse feed */
+	public function testFeedReverseDefault() {
+		$this -> printer -> feedReverse();
+		$this -> checkOutput("\x1b@\x1be\x01");
+	}
+
+	public function testFeedReverse3() {
+		$this -> printer -> feedReverse(3);
+		$this -> checkOutput("\x1b@\x1be\x03");
+	}
+
+	public function testFeedReverseNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feedReverse(-1);
+	}
+
+	public function testFeedReverseTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feedReverse(256);
+	}
+
+	public function testFeedReverseNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> feedReverse('hello');
+	}
+
+	/* Cut */
+	public function testCutDefault() {
+		// TODO check what the accepted range of values should be for $line
+		// cut($mode = self::CUT_FULL, $lines = 3)
+		$this -> printer -> cut();
+		$this -> checkOutput("\x1b@\x1dVA\x03");
+	}
+
+	/* Set barcode height */
+	public function testSetBarcodeHeightDefault() {
+		$this -> printer -> setBarcodeHeight();
+		$this -> checkOutput("\x1b@\x1dh\x08");
+	}
+
+	public function testBarcodeHeight10() {
+		$this -> printer -> setBarcodeHeight(10);
+		$this -> checkOutput("\x1b@\x1dh\x0a");
+	}
+
+	public function testSetBarcodeHeightNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeHeight(-1);
+	}
+
+	public function testSetBarcodeHeightTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeHeight(256);
+	}
+
+	public function tesSetBarcodeHeightNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeHeight('hello');
+	}
+
+	/* Barcode text position */
+	public function testSetBarcodeTextPositionDefault() {
+		$this -> printer -> setBarcodeTextPosition();
+		$this -> checkOutput("\x1b@\x1dH\x00");
+	}
+	
+	public function testSetBarcodeTextPositionBelow() {
+		$this -> printer -> setBarcodeTextPosition(Escpos::BARCODE_TEXT_BELOW);
+		$this -> checkOutput("\x1b@\x1dH\x02");
+	}
+
+	public function testSetBarcodeTextPositionBoth() {
+		$this -> printer -> setBarcodeTextPosition(Escpos::BARCODE_TEXT_BELOW | Escpos::BARCODE_TEXT_ABOVE);
+		$this -> checkOutput("\x1b@\x1dH\x03");
+	}
+	
+	public function testSetBarcodeTextPositionNegative() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeTextPosition(-1);
+	}
+	
+	public function testSetBarcodeTextPositionTooLarge() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeTextPosition(4);
+	}
+	
+	public function tesSetBarcodeTextPositionNonInteger() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setBarcodeTextPosition('hello');
+	}
+
+	/* Barcode - UPC-A */
+	public function testBarcodeUpcaNumeric11Char() {
+		$this -> printer -> barcode("01234567890", Escpos::BARCODE_UPCA);
+		$this -> checkOutput("\x1b@\x1dkA\x0b01234567890");
+	}
+	
+	public function testBarcodeUpcaNumeric12Char() {
+		$this -> printer -> barcode("012345678901", Escpos::BARCODE_UPCA);
+		$this -> checkOutput("\x1b@\x1dkA\x0c012345678901");
+	}
+	
+	public function testBarcodeUpcaNumeric13Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("0123456789012", Escpos::BARCODE_UPCA);
+	}
+	
+	public function testBarcodeUpcaNonNumeric12Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("A12345678901", Escpos::BARCODE_UPCA);
+	}
+
+	/* Barcode - UPC-E */
+	public function testBarcodeUpceNumeric6Char() {
+		$this -> printer -> barcode("123456", Escpos::BARCODE_UPCE);
+		$this -> checkOutput("\x1b@\x1dkB\x06123456");
+	}
+
+	public function testBarcodeUpceNumeric7Char() {
+		$this -> printer -> barcode("0123456", Escpos::BARCODE_UPCE);
+		$this -> checkOutput("\x1b@\x1dkB\x070123456");
+	}
+	
+	public function testBarcodeUpceNumeric8Char() {
+		$this -> printer -> barcode("01234567", Escpos::BARCODE_UPCE);
+		$this -> checkOutput("\x1b@\x1dkB\x0801234567");
+	}
+	
+	public function testBarcodeUpceNumeric11Char() {
+		$this -> printer -> barcode("01234567890", Escpos::BARCODE_UPCE);
+		$this -> checkOutput("\x1b@\x1dkB\x0b01234567890");
+	}
+	
+	public function testBarcodeUpceNumeric12Char() {
+		$this -> printer -> barcode("012345678901", Escpos::BARCODE_UPCE);
+		$this -> checkOutput("\x1b@\x1dkB\x0c012345678901");
+	}
+	
+	public function testBarcodeUpceNumeric9Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("012345678", Escpos::BARCODE_UPCE);
+	}
+	
+	public function testBarcodeUpceNonNumeric12Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("A12345678901", Escpos::BARCODE_UPCE);
+	}
+
+	/* Barcode - JAN13 */
+	public function testBarcodeJan13Numeric12Char() {
+		$this -> printer -> barcode("012345678901", Escpos::BARCODE_JAN13);
+		$this -> checkOutput("\x1b@\x1dkC\x0c012345678901");
+	}
+	
+	public function testBarcodeJan13Numeric13Char() {
+		$this -> printer -> barcode("0123456789012", Escpos::BARCODE_JAN13);
+		$this -> checkOutput("\x1b@\x1dkC\x0d0123456789012");
+	}
+	
+	public function testBarcodeJan13Numeric11Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("01234567890", Escpos::BARCODE_JAN13);
+	}
+	
+	public function testBarcodeJan13NonNumeric13Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("A123456789012", Escpos::BARCODE_JAN13);
+	}
+	
+	/* Barcode - JAN8 */
+	public function testBarcodeJan8Numeric7Char() {
+		$this -> printer -> barcode("0123456", Escpos::BARCODE_JAN8);
+		$this -> checkOutput("\x1b@\x1dkD\x070123456");
+	}
+	
+	public function testBarcodeJan8Numeric8Char() {
+		$this -> printer -> barcode("01234567", Escpos::BARCODE_JAN8);
+		$this -> checkOutput("\x1b@\x1dkD\x0801234567");
+	}
+	
+	public function testBarcodeJan8Numeric9Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("012345678", Escpos::BARCODE_JAN8);
+	}
+	
+	public function testBarcodeJan8NonNumeric8Char() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("A1234567", Escpos::BARCODE_JAN8);
+	}
+	
+	/* Barcode - Code39 */
+	public function testBarcodeCode39AsDefault() {
+		$this -> printer -> barcode("1234");
+		$this -> checkOutput("\x1b@\x1dkE\x041234");		
+	}
+
+	public function testBarcodeCode39Text() {
+		$this -> printer -> barcode("ABC 012", Escpos::BARCODE_CODE39);
+		$this -> checkOutput("\x1b@\x1dkE\x07ABC 012");
+	}
+	
+	public function testBarcodeCode39SpecialChars() {
+		$this -> printer -> barcode("$%+-./", Escpos::BARCODE_CODE39);
+		$this -> checkOutput("\x1b@\x1dkE\x06$%+-./");
+	}
+	
+	public function testBarcodeCode39Asterisks() {
+		$this -> printer -> barcode("*TEXT*", Escpos::BARCODE_CODE39);
+		$this -> checkOutput("\x1b@\x1dkE\x06*TEXT*");
+	}
+	
+	public function testBarcodeCode39AsterisksUnmatched() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("*TEXT", Escpos::BARCODE_CODE39);
+	}
+	
+	public function testBarcodeCode39AsteriskInText() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("12*34", Escpos::BARCODE_CODE39);
+	}
+	
+	public function testBarcodeCode39Lowercase() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("abcd", Escpos::BARCODE_CODE39);
+	}
+	
+	public function testBarcodeCode39Empty() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("**", Escpos::BARCODE_CODE39);
+	}
+
+	/* Barcode - ITF */
+	public function testBarcodeItfNumericEven() {
+		$this -> printer -> barcode("1234", Escpos::BARCODE_ITF);
+		$this -> checkOutput("\x1b@\x1dkF\x041234");		
+	}
+	
+	public function testBarcodeItfNumericOdd() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("123", Escpos::BARCODE_ITF);
+	}
+	
+	public function testBarcodeItfNonNumericEven() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("A234", Escpos::BARCODE_ITF);
+	}
+
+	/* Barcode - Codabar */
+	public function testBarcodeCodabarNumeric() {
+		$this -> printer -> barcode("A012345A", Escpos::BARCODE_CODABAR);
+		$this -> checkOutput("\x1b@\x1dkG\x08A012345A");
+	}
+	
+	public function testBarcodeCodabarSpecialChars() {
+		$this -> printer -> barcode("A012$+-./:A", Escpos::BARCODE_CODABAR);
+		$this -> checkOutput("\x1b@\x1dkG\x0bA012$+-./:A");
+	}
+	
+	public function testBarcodeCodabarNotWrapped() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("012345", Escpos::BARCODE_CODABAR);
+	}
+	
+	public function testBarcodeCodabarStartStopWrongPlace() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("012A45", Escpos::BARCODE_CODABAR);
+	}
+
+	/* Barcode - Code93 */
+	public function testBarcodeCode93Valid() {
+		$this -> printer -> barcode("012abcd", Escpos::BARCODE_CODE93);
+		$this -> checkOutput("\x1b@\x1dkH\x07012abcd");
+	}
+
+	public function testBarcodeCode93Empty() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("", Escpos::BARCODE_CODE93);
+	}
+
+	/* Barcode - Code128 */
+	public function testBarcodeCode128ValidA() {
+		$this -> printer -> barcode("{A" . "012ABCD", Escpos::BARCODE_CODE128);
+		$this -> checkOutput("\x1b@\x1dkI\x09{A012ABCD");
+	}
+
+	public function testBarcodeCode128ValidB() {
+		$this -> printer -> barcode("{B" . "012ABCDabcd", Escpos::BARCODE_CODE128);
+		$this -> checkOutput("\x1b@\x1dkI\x0d{B012ABCDabcd");
+	}
+	
+	public function testBarcodeCode128ValidC() {
+		$this -> printer -> barcode("{C" . chr ( 21 ) . chr ( 32 ) . chr ( 43 ), Escpos::BARCODE_CODE128);
+		$this -> checkOutput("\x1b@\x1dkI\x05{C\x15 +");
+	}
+	
+	public function testBarcodeCode128NoCodeSet() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> barcode("ABCD", Escpos::BARCODE_CODE128);
+	}
+	
+	/* Pulse */
+	function testPulseDefault() {
+		$this -> printer -> pulse();
+		$this -> checkOutput("\x1b@\x1bp0<x");
+	}
+
+	function testPulse1() {
+		$this -> printer -> pulse(1);
+		$this -> checkOutput("\x1b@\x1bp1<x");
+	}
+	
+	function testPulseEvenMs() {
+		$this -> printer -> pulse(0, 2, 2);
+		$this -> checkOutput("\x1b@\x1bp0\x01\x01");
+	}
+	
+	function testPulseOddMs() {
+		$this -> printer -> pulse(0, 3, 3); // Should be rounded down and give same output
+		$this -> checkOutput("\x1b@\x1bp0\x01\x01");
+	}
+	
+	function testPulseTooHigh() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> pulse(0, 512, 2);
+	}
+	
+	function testPulseTooLow() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> pulse(0, 0, 2);
+	}
+	
+	function testPulseNotANumber() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> pulse("fish");
+	}
+	
+	/* Set reverse */
+    public function testSetReverseColorsDefault() {
+		$this -> printer -> setReverseColors();
+		$this -> checkOutput("\x1b@\x1dB\x01");
+    }
+
+    public function testSetReverseColorsOn() {
+		$this -> printer -> setReverseColors(true);
+		$this -> checkOutput("\x1b@\x1dB\x01");
+    }
+
+    public function testSetReverseColorsOff() {
+		$this -> printer -> setReverseColors(false);
+		$this -> checkOutput("\x1b@\x1dB\x00");
+    }
+
+    public function testSetReverseColorsNonBoolean() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setReverseColors(7);
+	}
+
+	/* Bit image print */
+	public function testBitImageBlack() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_black.png");
+		$this -> printer -> bitImage($img);
+		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x01\x00\x80");
+	}
+
+	public function testBitImageWhite() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_white.png");
+		$this -> printer -> bitImage($img);
+		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x01\x00\x00");
+	}
+	
+	public function testBitImageBoth() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/black_white.png");
+		$this -> printer -> bitImage($img);
+		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x02\x00\xc0\x00");
+	}
+	
+	public function testBitImageTransparent() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/black_transparent.png");
+		$this -> printer -> bitImage($img);
+		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x02\x00\xc0\x00");
+	}
+	
+	/* Graphics print */
+	public function testGraphicsWhite() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_white.png");
+		$this -> printer -> graphics($img);
+		$this -> checkOutput("\x1b@\x1d(L\x0b\x000p0\x01\x011\x01\x00\x01\x00\x00\x1d(L\x02\x0002");
+	}
+	
+	public function testGraphicsBlack() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_black.png");
+		$this -> printer -> graphics($img);
+		$this -> checkOutput("\x1b@\x1d(L\x0b\x000p0\x01\x011\x01\x00\x01\x00\x80\x1d(L\x02\x0002");
+	}
+		
+	public function testGraphicsBoth() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/black_white.png");
+		$this -> printer -> graphics($img);
+		$this -> checkOutput("\x1b@\x1d(L\x0c\x000p0\x01\x011\x02\x00\x02\x00\xc0\x00\x1d(L\x02\x0002");
+	}
+	
+	public function testGraphicsTransparent() {
+		$this -> requireGraphicsLibrary();
+		$img = new EscposImage(dirname(__FILE__)."/resources/black_transparent.png");
+		$this -> printer -> graphics($img);
+		$this -> checkOutput("\x1b@\x1d(L\x0c\x000p0\x01\x011\x02\x00\x02\x00\xc0\x00\x1d(L\x02\x0002");
+	}
+
+	/* QR code */
+	public function testQRCodeDefaults() {
+		// Test will fail if default values change
+		$this -> printer -> qrCode("1234");
+		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
+	}
+	
+	public function testQRCodeDefaultsAreCorrect() {
+		// Below tests assume that defaults are as written here (output string should be same as above)
+		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 3, Escpos::QR_MODEL_2);
+		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
+	}
+	
+	public function testQRCodeEmpty() {
+		$this -> printer -> qrCode('');
+		$this -> checkOutput("\x1b@"); // No commands actually sent
+	}
+	
+	public function testQRCodeChangeEC() {
+		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_H);
+		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E3\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
+	}
+	
+	public function testQRCodeChangeSize() {
+		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 7);
+		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x07\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
+	}
+	
+	public function testQRCodeChangeModel() {
+		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 3, Escpos::QR_MODEL_1);
+		$this -> checkOutput("\x1b@\x1d(k\x04\x001A1\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
+	}
+
+	/* Feed form - Required on page-mode only printers */
+	public function testFeedForm() {
+		$this -> printer -> feedForm();
+		$this -> checkOutput("\x1b@\x0c");
+	}
+	
+	/* Get status  */
+	public function testGetStatus() {
+		$this -> markTestIncomplete("Status check test code not implemented.");
+		// TODO some unit testing here on statuses
+		// $a = $this -> printer -> getPrinterStatus(Escpos::STATUS_PRINTER);
+	}
+
+	/* Set text size  */
+	public function testSetTextSizeNormal() {
+		$this -> printer -> setTextSize(1, 1);
+		$this -> checkOutput("\x1b@\x1d!\x00");
+	}
+
+	public function testSetTextSizeWide() {
+		$this -> printer -> setTextSize(4, 1);
+		$this -> checkOutput("\x1b@\x1d!0");
+	}
+
+	public function testSetTextSizeNarrow() {
+		$this -> printer -> setTextSize(1, 4);
+		$this -> checkOutput("\x1b@\x1d!\x03");
+	}
+
+	public function testSetTextSizeLarge() {
+		$this -> printer -> setTextSize(4, 4);
+		$this -> checkOutput("\x1b@\x1d!3");
+	}
+
+	public function testSetTextSizeInvalid() {
+		$this -> setExpectedException('InvalidArgumentException');
+		$this -> printer -> setTextSize(0, 9);
+	}
+}
+
+/*
+ * For testing that string-castable objects are handled
+ */
+class FooBar {
+	private $foo;
+	public function __construct($foo) {
+		$this -> foo = $foo;
+	}
+	
+	public function __toString() {
+		return $this -> foo;
+	}
+}
+?>
diff --git a/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php b/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
new file mode 100644
index 00000000000..53690483c7a
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
@@ -0,0 +1,252 @@
+<?php
+class WindowsPrintConnectorTest extends PHPUnit_Framework_TestCase {
+	private $connector;
+
+	public function testLptWindows() {
+		// Should attempt to send data to the local printer by writing to it
+		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> once())
+				-> method('runWrite')
+				-> with($this -> equalTo(''), $this -> equalTo("LPT1"));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testLptMac() {
+		// Cannot print to local printer on Mac with this connector
+		$this -> setExpectedException('BadMethodCallException');
+		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_MAC);
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testLptLinux() {
+		// Cannot print to local printer on Linux with this connector
+		$this -> setExpectedException('BadMethodCallException');
+		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testComWindows() {
+		// Simple file write
+		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> once())
+				-> method('runWrite')
+				-> with($this -> equalTo(''), $this -> equalTo("COM1"));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testComMac() {
+		// Cannot print to local printer on Mac with this connector
+		$this -> setExpectedException('BadMethodCallException');
+		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_MAC);
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testComLinux() {
+		// Cannot print to local printer on Linux with this connector
+		$this -> setExpectedException('BadMethodCallException');
+		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testLocalShareWindows() {
+		$connector = $this -> getMockConnector("Printer", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> once())
+				-> method('runCopy')
+				-> with($this -> anything(), $this -> stringContains('\\Printer'));
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterWindows() {
+		$connector = $this -> getMockConnector("smb://example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> once())
+				-> method('runCopy')
+				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterWindowsUsername() {
+		$connector = $this -> getMockConnector("smb://bob@example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:bob\''));
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> once())
+				-> method('runCopy')
+				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterWindowsUsernameDomain() {
+		$connector = $this -> getMockConnector("smb://bob@example-pc/home/Printer", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:home\\bob\''));
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> once())
+				-> method('runCopy')
+				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterWindowsUsernamePassword() {
+		$connector = $this -> getMockConnector("smb://bob:secret@example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:bob\' \'secret\''));
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');	
+		$connector -> expects($this -> once())
+				-> method('runCopy')
+				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterMac() {
+		// Not implemented
+		$this -> setExpectedException('Exception');
+		$connector = $this -> getMockConnector("smb://Guest@example-pc/Printer", WindowsPrintConnector::PLATFORM_MAC);
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCommand');
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterLinux() {
+		$connector = $this -> getMockConnector("smb://example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -c \'print -\' -N'));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterLinuxUsername() {
+		$connector = $this -> getMockConnector("smb://bob@example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -U \'bob\' -c \'print -\' -N'));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterLinuxUsernameDomain() {
+		$connector = $this -> getMockConnector("smb://bob@example-pc/home/Printer", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -U \'home\\bob\' -c \'print -\' -N'));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> finalize();
+	}
+
+	public function testSharedPrinterLinuxUsernamePassword() {
+		$connector = $this -> getMockConnector("smb://bob:secret@example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
+		$connector -> expects($this -> once())
+				-> method('runCommand')
+				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' \'secret\' -U \'bob\' -c \'print -\''));
+		$connector -> expects($this -> exactly(0))
+				-> method('runCopy');
+		$connector -> expects($this -> exactly(0))
+				-> method('runWrite');
+		$connector -> finalize();
+	}
+
+	private function getMockConnector($path, $platform) {
+		$stub = $this -> getMockBuilder('WindowsPrintConnector')
+				-> setMethods(array('runCopy', 'runCommand', 'getCurrentPlatform', 'runWrite'))
+				-> disableOriginalConstructor()
+				-> getMock();
+		$stub -> method('runCommand')
+				-> willReturn(0);
+		$stub -> method('runCopy')
+				-> willReturn(true);
+		$stub -> method('runWrite')
+				-> willReturn(true);
+		$stub -> method('getCurrentPlatform')
+				-> willReturn($platform);
+		$stub -> __construct($path);
+		return $stub;
+	}
+
+	/**
+	 * Test for correct identification of bogus or non-supported Samba strings.
+	 */
+	public function testSambaRegex() {
+		$good = array("smb://foo/bar",
+				"smb://foo/bar baz",
+				"smb://bob@foo/bar",
+				"smb://bob:secret@foo/bar",
+				"smb://foo-computer/FooPrinter",
+				"smb://foo-computer/workgroup/FooPrinter",
+				"smb://foo-computer/Foo Printer");
+		$bad = array("",
+				"http://google.com",
+				"smb:/foo/bar",
+				"smb://",
+				"smb:///bar",
+				"smb://@foo/bar",
+				"smb://bob:@foo/bar",
+				"smb://:secret@foo/bar",
+				"smb://foo/bar/baz/quux",
+				"smb://foo-computer//FooPrinter");
+		foreach($good as $item) {
+			$this -> assertTrue(preg_match(WindowsPrintConnector::REGEX_SMB, $item) == 1, "Windows samba regex should pass '$item'.");
+		}
+		foreach($bad as $item) {
+			$this -> assertTrue(preg_match(WindowsPrintConnector::REGEX_SMB, $item) != 1, "Windows samba regex should fail '$item'.");
+		}
+	}
+}
diff --git a/htdocs/includes/escpos/test/unit/resources/black_transparent.gif b/htdocs/includes/escpos/test/unit/resources/black_transparent.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6c54bad9eea0d1cd39e55504d181b6607b6028d4
GIT binary patch
literal 65
zcmZ?wbhEHbWMW`q_`m=Kia%Kx85kHD6#of27o{eaq^2m8XO?6rxO@5rFzA33fs`{a
LF|!D<GFSrupd1TX

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/black_transparent.png b/htdocs/includes/escpos/test/unit/resources/black_transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..b43bbb85cc0977c1759d2a9f0fc6627ed4336ac2
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`1|*BN@u~nRwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwgnNLhfd<&=O9H5Y7iEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI8YJ4r;B3<$MxitgoGdG8+aJ_#26XR&Dh)tlw$C7^>bP0l+XkK
D$`C0q

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.bmp b/htdocs/includes/escpos/test/unit/resources/black_white.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..0acbf66506f8ae152df4bfabc835e03505112878
GIT binary patch
literal 138
ycmZ?r?P7p{Dj<~u#7t1k$RGih5CD?G+z<>F01{5_LB%jOu{6kBWbhvh5F!BXKMAt{

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.gif b/htdocs/includes/escpos/test/unit/resources/black_white.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a044a671f59c3c4a5f859eb6a09a71d809be683
GIT binary patch
literal 65
zcmZ?wbhEHbWMW`q_`t{j1poj4SNzEWVlgQG6Lc<0O)N=GQ7F$W$xv|j^bKIp0m*=r
NGcYl;2(dC)0{}064pjgE

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.jpg b/htdocs/includes/escpos/test/unit/resources/black_white.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6539cece59e6c5ce41bf50f1ced121096ead5aed
GIT binary patch
literal 175
zcmex=<NpH&0WUXCHwH#VCI%TGWcYuZ!I^=X2?RhSGZ3(_v48*v8yhPdCkGc7CkH1d
z7Y{!V7dIa_Cnv8UFCV{vfS>>ukC3pCfH06P@c#e<HwOa~0}~^oAjAJ73?dAS45)wu
qC@L+$z`%|w!OG4d5i#xZ|62?kj6fNChI*H08>52OWR?s5zX<@pgBjQW

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.png b/htdocs/includes/escpos/test/unit/resources/black_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..33ba331fa1e8642247b0cd1e48e03e7bb24a624b
GIT binary patch
literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScv!3p^r$G`BDaGcwGYBLNg-FY)ws
zWxvnN$08&+x9_71P)M@GHKN2hKQ}iuuY|$5C^fMpHASI3vm`^o-P1Q9ypc~Fs7TDy
o#W95AdU65;{Q3Xio|&1MfuD`(|Am>%Vn7uPp00i_>zopr06?22>i_@%

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.bmp b/htdocs/includes/escpos/test/unit/resources/canvas_black.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..2ee723c59d87be01c0901a2662fc414e7898d904
GIT binary patch
literal 142
zcmZ?r?PGv|E+AC{#Eft(0hV9^ljy{M1_lTMN&I(m4=Qdr^i?Bahn%QF>uW{_V`Jfl
cv@|t`v^2H_GiP$za9w9siRm{&HU*ox0Ab1$MF0Q*

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.gif b/htdocs/includes/escpos/test/unit/resources/canvas_black.gif
new file mode 100644
index 0000000000000000000000000000000000000000..49b19dbc179f5995e4ff5338e7039d3a47b4a888
GIT binary patch
literal 72
zcmZ?wbhEHbWMp7u_`t{j1poj4SNzEWVlgQG=l0A^Oi%SqOwUZt=1ot`%}um5&@(YL
UF*Rk-0jU6KV_;%(VPvod0K2{rbpQYW

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.jpg b/htdocs/includes/escpos/test/unit/resources/canvas_black.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d059f431b267596da878937214280915c89f51ee
GIT binary patch
literal 160
zcmZ9GK@P$|3<DinR!Mf-W?NptCpaKgf=}`l4m<+Ng`b4Y5yp~b`C!?f{()WB%L*bw
z2>!+y-7X048hz>mPHCTnRfR>gOhxmUMTR<zlUX$_^D^7gviTjEV~?o9A2`JF4-&2Y
Ox9|<zp5TPz&0k+u*%QkE

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.png b/htdocs/includes/escpos/test/unit/resources/canvas_black.png
new file mode 100644
index 0000000000000000000000000000000000000000..52e6ba9ffd3ed0406bbd384e70e6b07587655808
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgLbVpxD28NCO+<y{TfqaEzk04(L
zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVS?>+a<gN$m8;K
zaSY+Oo(xpQz{J4#NO6xbkfmDU8c~vxSdwa$T$Bo=7>o=IO?3^7bqx(d49u-eEv*bK
owG9oe3=Ayq=dVT4kei>9nO2EggGbYKL7)Z(Pgg&ebxsLQ05fwqK>z>%

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.bmp b/htdocs/includes/escpos/test/unit/resources/canvas_white.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..e47e0ef617583acde08ae6d8ddf8045fb1a4e55e
GIT binary patch
literal 142
zcmZ?r?PGv|E+AC{#Eft(0hV9^ljy{M1_lTMN&I(m4=Qdr^i?Bahn%QF>uW{_V`Jfl
hv@|t`v^2H_GiP$za9w9siRm{&HU-_>|Ns9p003&i7eW94

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.gif b/htdocs/includes/escpos/test/unit/resources/canvas_white.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7881ce629acf8d6918eb5ac07169bc67b99a904b
GIT binary patch
literal 72
zcmZ?wbhEHbWMp7u_`t{j1poj4SNzEWVlgQG=l0A^Oi%SqOwUZt=1ot`%}um5&@(YL
UF*Rk-0jU6KV_;(PVPvod0K480eE<Le

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.jpg b/htdocs/includes/escpos/test/unit/resources/canvas_white.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..516a965c73e092c97365aaf294a3572c47eedbf3
GIT binary patch
literal 160
zcmZ9Gu@1sO3_~4SPD$?C=34%T0jUzqd@uta0d#;r36~L`CCl<)*&qIaUDopoB0>nh
z;e>7%gm;ZT^#P}}Pr|CgB3h=RdCVe19mdJ5nwEK)ZE4y3hRm@?RN;3VV)+M&*8W@g
M3*4UIi0j**UsypDH2?qr

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.png b/htdocs/includes/escpos/test/unit/resources/canvas_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..4231a4bb5400c5554d146b0f8b32b717c109c1bf
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgLbVpxD28NCO+<y{TfqaEzk04(L
zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVS?>+a<gN$m8;K
zaSY+Oo}2+>H!(Ecb<X+%WT}?8MwFx^mZVxG7o`Fz1|tJQQ(XgNT|<Kq19K}=ODjW5
oZ9_vV0|U$Z`D;-$<mRVjrd8tB;L&tl5U7E{)78&qol`;+0O!&<)c^nh

literal 0
HcmV?d00001

diff --git a/htdocs/includes/escpos/test/unit/resources/demo.php b/htdocs/includes/escpos/test/unit/resources/demo.php
new file mode 100644
index 00000000000..67ea53c1bfd
--- /dev/null
+++ b/htdocs/includes/escpos/test/unit/resources/demo.php
@@ -0,0 +1,19 @@
+<?php
+$im = new Imagick();
+try {
+	$im -> readImage("doc.pdf[5]");
+	$im -> destroy();
+} catch(ImagickException $e) {
+	echo "Error: " . $e -> getMessage() . "\n";
+}
+
+$im = new Imagick();
+try {
+	ob_start();
+	@$im -> readImage("doc.pdf[5]");
+	ob_end_clean();
+	$im -> destroy();
+} catch(ImagickException $e) {
+	echo "Error: " . $e -> getMessage() . "\n";
+}
+
diff --git a/htdocs/includes/escpos/test/unit/resources/doc.pdf b/htdocs/includes/escpos/test/unit/resources/doc.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..22247b918dbbcbfb0981d9442c966c99a47361b4
GIT binary patch
literal 6681
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
bQ5=#CZ9g8L&gBcKi39DzR8)+usIdP4$C)m7

literal 0
HcmV?d00001


From 2b4224d4c4650b56f317fbaba9de40ec92300d8a Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sun, 1 Nov 2015 10:10:14 +0100
Subject: [PATCH 075/216] List Jobs

---
 .../modules/printing/printgcp.modules.php     | 52 ++++++++++--------
 .../modules/printing/printipp.modules.php     | 55 +++++++++++--------
 htdocs/printing/index.php                     |  6 +-
 3 files changed, 66 insertions(+), 47 deletions(-)

diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index e7d34f3666c..4ce1e18b390 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -352,11 +352,13 @@ class printing_printgcp extends PrintingDriver
     /**
      *  List jobs print
      *
-     *  @return void
+     *  @return  int                     0 if OK, >0 if KO
      */
     function list_jobs()
     {
         global $conf, $db, $bc;
+        $error = 0;
+        $html = '';
         // Token storage
         $storage = new DoliStorage($this->db, $this->conf);
         // Setup the credentials for the requests
@@ -374,6 +376,7 @@ class printing_printgcp extends PrintingDriver
         } catch (Exception $e) {
             $this->errors[] = $e->getMessage();
             $token_ok = false;
+            $error++;
         }
         $expire = false;
         // Is token expired or will token expire in the next 30 seconds
@@ -391,6 +394,7 @@ class printing_printgcp extends PrintingDriver
                 $storage->storeAccessToken('Google', $token);
             } catch (Exception $e) {
                 $this->errors[] = $e->getMessage();
+                $error++;
             }
         }
         // Getting Jobs
@@ -399,35 +403,37 @@ class printing_printgcp extends PrintingDriver
             $response = $apiService->request(self::PRINTERS_GET_JOBS);
         } catch (Exception $e) {
             $this->errors[] = $e->getMessage();
-            print '<pre>'.print_r($e->getMessage(),true).'</pre>';
+            $error++;
         }
         $responsedata = json_decode($response, true);
-        //print '<pre>'.print_r($responsedata,true).'</pre>';
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print "<td>Id</td>";
-        print "<td>Owner</td>";
-        print "<td>Printer</td>";
-        print "<td>File</td>";
-        print "<td>Status</td>";
-        print "<td>Cancel</td>";
-        print "</tr>\n";
+        //$html .= '<pre>'.print_r($responsedata,true).'</pre>';
+        $html .= '<table width="100%" class="noborder">';
+        $html .= '<tr class="liste_titre">';
+        $html .= "<td>Id</td>";
+        $html .= "<td>Owner</td>";
+        $html .= '<td>Printer</td>';
+        $html .= '<td>File</td>';
+        $html .= '<td>Status</td>';
+        $html .= '<td>Cancel</td>';
+        $html .= '</tr>'."\n";
         $var = True;
         $jobs = $responsedata['jobs'];
-        //print '<pre>'.print_r($jobs['0'],true).'</pre>';
+        //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
         foreach ($jobs as $value )
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
-            print '<td>'.$value['id'].'</td>';
-            print '<td>'.$value['ownerId'].'</td>';
-            print '<td>'.$value['printerName'].'</td>';
-            print '<td>'.$value['title'].'</td>';
-            print '<td>'.$value['status'].'</td>';
-            print '<td>&nbsp;</td>';
-            print '</tr>';
+            $var = !$var;
+            $html .= '<tr '.$bc[$var].'>';
+            $html .= '<td>'.$value['id'].'</td>';
+            $html .= '<td>'.$value['ownerId'].'</td>';
+            $html .= '<td>'.$value['printerName'].'</td>';
+            $html .= '<td>'.$value['title'].'</td>';
+            $html .= '<td>'.$value['status'].'</td>';
+            $html .= '<td>&nbsp;</td>';
+            $html .= '</tr>';
         }
-        print "</table>";
+        $html .= '</table>';
+        $this->resprint = $html;
+        return $error;
     }
 
 }
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 56cd4c3b2b6..6e8ad305339 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -228,13 +228,15 @@ class printing_printipp extends PrintingDriver
     /**
      *  List jobs print
      *
-     * @param   string      $module     module
+     *  @param   string      $module     module
      *
-     *  @return void
+     *  @return  int                     0 if OK, >0 if KO
      */
     function list_jobs($module)
     {
         global $conf, $db, $bc;
+        $error = 0;
+        $html = '';
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
         $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose
@@ -259,32 +261,39 @@ class printing_printipp extends PrintingDriver
             }
         }
         // Getting Jobs
-        $ipp->getJobs(false,0,'completed',false);
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print "<td>Id</td>";
-        print "<td>Owner</td>";
-        print "<td>Printer</td>";
-        print "<td>File</td>";
-        print "<td>Status</td>";
-        print "<td>Cancel</td>";
-        print "</tr>\n";
+        try {
+            $ipp->getJobs(false,0,'completed',false);
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $error++;
+        }
+        $html .= '<table width="100%" class="noborder">';
+        $html .= '<tr class="liste_titre">';
+        $html .= '<td>Id</td>';
+        $html .= '<td>Owner</td>';
+        $html .= '<td>Printer</td>';
+        $html .= '<td>File</td>';
+        $html .= '<td>Status</td>';
+        $html .= '<td>Cancel</td>';
+        $html .= '</tr>'."\n";
         $jobs = $ipp->jobs_attributes;
         $var = True;
-        //print '<pre>'.print_r($jobs,true).'</pre>';
+        //$html .= '<pre>'.print_r($jobs,true).'</pre>';
         foreach ($jobs as $value )
         {
-            $var=!$var;
-            print "<tr ".$bc[$var].">";
-            print '<td>'.$value->job_id->_value0.'</td>';
-            print '<td>'.$value->job_originating_user_name->_value0.'</td>';
-            print '<td>'.$value->printer_uri->_value0.'</td>';
-            print '<td>'.$value->job_name->_value0.'</td>';
-            print '<td>'.$value->job_state->_value0.'</td>';
-            print '<td>'.$value->job_uri->_value0.'</td>';
-            print '</tr>';
+            $var = !$var;
+            $html .= '<tr '.$bc[$var].'>';
+            $html .= '<td>'.$value->job_id->_value0.'</td>';
+            $html .= '<td>'.$value->job_originating_user_name->_value0.'</td>';
+            $html .= '<td>'.$value->printer_uri->_value0.'</td>';
+            $html .= '<td>'.$value->job_name->_value0.'</td>';
+            $html .= '<td>'.$value->job_state->_value0.'</td>';
+            $html .= '<td>'.$value->job_uri->_value0.'</td>';
+            $html .= '</tr>';
         }
-        print "</table>";
+        $html .= "</table>";
+        $this->resprint = $html;
+        return $error;
     }
 
 }
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 2bee135ca44..1a1b038d47f 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -39,7 +39,11 @@ foreach ($result as $driver) {
     $printer = new $classname($db);
     if ($conf->global->{$printer->active}) {
         //$printer->list_jobs('commande');
-        $printer->list_jobs();
+        if ($printer->list_jobs()==0) {
+            print $printer->resprint;
+        } else {
+            setEventMessages($printer->error, $printer->errors, 'errors');
+        }
     }
 }
 

From b9367bb19666812d53cec4240e7493754c9c7ca3 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sun, 1 Nov 2015 11:24:51 +0100
Subject: [PATCH 076/216] Errors management

---
 htdocs/core/actions_printing.inc.php          |  8 +++--
 .../modules/printing/printgcp.modules.php     | 31 ++++++++++++-------
 .../modules/printing/printipp.modules.php     | 26 +++++++++++-----
 htdocs/printing/admin/printing.php            |  6 +++-
 4 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index eeecc25fbd2..030e7016a55 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -47,17 +47,19 @@ if ($action == 'print_file' and $user->rights->printing->read)
             if (! empty($conf->global->{$printer->active})) {
                 $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':'');
                 $ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir);
-                if ($ret < 0) {
+                if ($ret > 0) {
+                    //print '<pre>'.print_r($printer->errors, true).'</pre>';
                     setEventMessages($printer->error, $printer->errors, 'errors');
                 }
                 if ($ret==0) {
-                    setEventMessages($printer->error, $printer->errors, 'warning');
+                    //print '<pre>'.print_r($printer->errors, true).'</pre>';
+                    setEventMessages($printer->error, $printer->errors);
                     setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name, null);
                     $printed++;
                 }
             }
         }
-        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null);
+        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warning');
     } else {
         setEventMessages($langs->trans("NoModuleFound"), null, 'warning');
     }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 4ce1e18b390..ab838270372 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -42,6 +42,8 @@ class printing_printgcp extends PrintingDriver
     var $conf = array();
     var $google_id = '';
     var $google_secret = '';
+    var $error;
+    var $errors = array();
     var $db;
 
     const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
@@ -122,11 +124,12 @@ class printing_printgcp extends PrintingDriver
     /**
      *  Return list of available printers
      *
-     *  @return string                html list of printers
+     *  @return  int                     0 if OK, >0 if KO
      */
     function listAvailablePrinters()
     {
         global $bc, $conf, $langs;
+        $error = 0;
         $langs->load('printing');
         $var=true;
 
@@ -145,7 +148,7 @@ class printing_printgcp extends PrintingDriver
         $var = true;
         foreach ($list['available'] as $printer_det)
         {
-            $var=!$var;
+            $var = !$var;
             $html.= "<tr ".$bc[$var].">";
             $html.= '<td>'.$printer_det['name'].'</td>';
             $html.= '<td>'.$printer_det['displayName'].'</td>';
@@ -165,8 +168,8 @@ class printing_printgcp extends PrintingDriver
             $html.= '</td>';
             $html.= '</tr>'."\n";
         }
-
-        return $html;
+        $this->resprint = $html;
+        return $error;
     }
 
 
@@ -240,15 +243,19 @@ class printing_printgcp extends PrintingDriver
      * @param   string      $file       file
      * @param   string      $module     module
      * @param   string      $subdir     subdir for file
-     * @return  int                     0 if OK, <0 if KO
+     * @return  int                     0 if OK, >0 if KO
      */
     function print_file($file, $module, $subdir='')
     {
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
         global $conf, $user, $db;
+        $error = 0;
 
         $fileprint=$conf->{$module}->dir_output;
         if ($subdir!='') $fileprint.='/'.$subdir;
         $fileprint.='/'.$file;
+        $mimetype = dol_mimetype($fileprint);
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$module."' AND driver='printgcp' AND userid=".$user->id;
         $result = $db->query($sql);
@@ -267,18 +274,18 @@ class printing_printgcp extends PrintingDriver
                 }
                 else
                 {
-                    return 'NoDefaultPrinterDefined';
+                    $this->errors[] = 'NoDefaultPrinterDefined';
+                    $error++;
+                    return $error;
                 }
             }
         }
         else dol_print_error($db);
 
-        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, 'application/pdf');
-        $this->error = 'PRINTGCP: '.$ret['errormessage'];
-        if ($ret['status']==1) 
-            return 0;
-        else
-            return -1;
+        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
+        $this->errors = 'PRINTGCP: '.mb_convert_encoding($ret['errormessage'], "UTF-8");
+        if ($ret['status']!=1) $error++;
+        return $error;
     }
 
     /**
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 6e8ad305339..eaf655d7edf 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -41,6 +41,7 @@ class printing_printipp extends PrintingDriver
     var $user;
     var $password;
     var $error;
+    var $errors = array();
     var $db;
 
 
@@ -72,11 +73,12 @@ class printing_printipp extends PrintingDriver
      * @param   string      $module     module
      * @param   string      $subdir     subdirectory of document like for expedition subdir is sendings
      *
-     * @return  int                     0 if OK, <0 if KO
+     * @return  int                     0 if OK, >0 if KO
      */
     function print_file($file, $module, $subdir='')
     {
         global $conf, $user, $db;
+        $error = 0;
 
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
 
@@ -108,8 +110,9 @@ class printing_printipp extends PrintingDriver
                 }
                 else
 				{
-                    $this->error = 'NoDefaultPrinterDefined';
-                    return -1;
+                    $this->errors[] = 'NoDefaultPrinterDefined';
+                    $error++;
+                    return $error;
                 }
             }
         }
@@ -121,19 +124,26 @@ class printing_printipp extends PrintingDriver
         if ($subdir!='') $fileprint.='/'.$subdir;
         $fileprint.='/'.$file;
         $ipp->setData($fileprint);
-        $ipp->printJob();
+        try {
+            $ipp->printJob();
+        } catch (Exception $e) {
+            $this->errors[] = $e->getMessage();
+            $error++;
+        }
+        if ($error==0) $this->errors[] = 'PRINTIPP: Job added';
 
-        return 0;
+        return $error;
     }
 
     /**
      *  Return list of available printers
      *
-     *  @return string                html list of printers
+     *  @return  int                     0 if OK, >0 if KO
      */
     function listAvailablePrinters()
     {
         global $bc, $conf, $langs;
+        $error = 0;
         $var=true;
 
         $html = '<tr class="liste_titre">';
@@ -180,8 +190,8 @@ class printing_printipp extends PrintingDriver
 			$html.= '</td>';
             $html.= '</tr>'."\n";
         }
-
-        return $html;
+        $this->resprint = $html;
+        return $error;
     }
 
     /**
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index da7de1bbdfb..6a28f352578 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -256,7 +256,11 @@ if ($mode == 'test' && $user->admin)
         $printer = new $classname($db);
         //print '<pre>'.print_r($printer, true).'</pre>';
         if (count($printer->getlist_available_printers())) {
-            print $printer->listAvailablePrinters();
+            if ($printer->listAvailablePrinters()==0) {
+                print $printer->resprint;
+            } else {
+                setEventMessages($printer->error, $printer->errors, 'errors');
+            }
         }
         else {
             print $langs->trans('PleaseConfigureDriverfromList');

From 0fd7ba478a79bc2cf6f675b4de07930dddd66fa4 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sun, 1 Nov 2015 17:27:41 +0100
Subject: [PATCH 077/216] Fix: add Mac OS

---
 htdocs/core/lib/functions.lib.php | 43 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5b990ac509c..fcadfb9e521 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -179,6 +179,7 @@ function getBrowserInfo($user_agent)
 
 	// OS
 	if (preg_match('/linux/i', $user_agent))	{ $os='linux'; }
+	elseif (preg_match('/macintosh/i', $user_agent))	{ $os='macintosh'; }
 
 	// Name
 	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg))  { $name='firefox';   $version=$reg[2]; }
@@ -703,7 +704,7 @@ function dol_fiche_head($links=array(), $active='0', $title='', $notab=0, $picto
 function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $picto='', $pictoisfullpath=0)
 {
 	global $conf,$langs, $hookmanager;
-	
+
 	$out="\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";
 
 	// Show title
@@ -733,7 +734,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	$displaytab=0;
 	$nbintab=0;
     $popuptab=0;
-    
+
 	for ($i = 0 ; $i <= $maxkey ; $i++)
 	{
 		if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2]))
@@ -777,7 +778,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 		else
 		{
 		    // The popup with the other tabs
-			if (! $popuptab) 
+			if (! $popuptab)
 			{
 			    $popuptab=1;
 			    $outmore.='<div class="popuptabset">';
@@ -795,13 +796,13 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 				$outmore.='<a'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 
 			$outmore.='</div>';
-			
+
 			$nbintab++;
 		}
 		$displaytab=$i;
 	}
 	if ($popuptab) $outmore.='</div>';
-	
+
 	if ($displaytab > $limittoshow)
 	{
 		$tabsname=str_replace("@", "", $picto);
@@ -817,7 +818,7 @@ function dol_get_fiche_head($links=array(), $active='', $title='', $notab=0, $pi
 	}
 
 	$out.="</div>\n";
-	
+
 	if (! $notab) $out.="\n".'<div class="tabBar">'."\n";
 
 	$parameters=array('tabname' => $active);
@@ -900,7 +901,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 	print '</div>';
 	print '<div class="underrefbanner clearboth"></div>';
 }
-   
+
 /**
  * Show a string with the label tag dedicated to the HTML edit field.
  *
@@ -1382,7 +1383,7 @@ function dol_print_size($size,$shortvalue=0,$shortunit=0)
 function dol_print_url($url,$target='_blank',$max=32,$withpicto=0)
 {
 	global $langs;
-	
+
 	if (empty($url)) return '';
 
 	$link='<a href="';
@@ -1675,7 +1676,7 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0)
 	global $conf, $user, $langs, $hookmanager;
 
 	$out = '';
-	
+
 	if ($address)
 	{
         if ($hookmanager) {
@@ -1683,7 +1684,7 @@ function dol_print_address($address, $htmlid, $mode, $id, $noprint=0)
             $reshook = $hookmanager->executeHooks('printAddress', $parameters, $address);
             $out.=$hookmanager->resPrint;
         }
-        if (empty($reshook)) 
+        if (empty($reshook))
         {
             $out.=nl2br($address);
             $showgmap=$showomap=0;
@@ -2748,7 +2749,7 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 	$sortorder=strtoupper($sortorder);
 	$out='';
     $sortimg='';
-    
+
 	$tag='th';
 	if ($thead==2) $tag='div';
 
@@ -2815,9 +2816,9 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 		$sortimg.= '</span>';
 	}
-	
+
 	$out.=$sortimg;
-	
+
 	$out.='</'.$tag.'>';
 
 	return $out;
@@ -2958,7 +2959,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 				if ($cpt > 2) $pagelist.='<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="inactive"':'data-role="button"').'>...</span></li>';
 				else if ($cpt == 2) $pagelist.='<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><a '.(empty($conf->dol_use_jmobile)?'':'data-role="button" ').'href="'.$file.'?page=1'.$options.'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">2</a></li>';
 			}
-			
+
 			do
 			{
 				if ($cpt==$page)
@@ -2972,7 +2973,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
 				$cpt++;
 			}
 			while ($cpt < $nbpages && $cpt<=$page+$maxnbofpage);
-			
+
 			if ($cpt<$nbpages)
 			{
 				if ($cpt<$nbpages-2) $pagelist.= '<li'.(empty($conf->dol_use_jmobile)?' class="pagination"':'').'><span '.(empty($conf->dol_use_jmobile)?'class="inactive"':'data-role="button"').'>...</span></li>';
@@ -4402,7 +4403,7 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
 	}
 	else if ($nameorder == 2)
 	{
-	   $ret.=$firstname;   
+	   $ret.=$firstname;
 	}
 	else
 	{
@@ -5225,7 +5226,7 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 
 /**
  * Return the filename of file to get the thumbs
- * 
+ *
  * @param   string  $file           Original filename
  * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
  * @param   string  $extImgTarget   Force image format for thumbs. Use '' to keep same extension than original image.
@@ -5235,10 +5236,10 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
 {
 	$dirName = dirname($file);
 	if ($dirName == '.') $dirName='';
-	
+
     $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
 	$fileName = basename($fileName);
-	
+
 	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
     if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i',$file)?'.jpeg':'');
     if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i',$file)?'.gif':'');
@@ -5246,9 +5247,9 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
     if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i',$file)?'.bmp':'');
 
     if (! $extImgTarget) return $file;
-	
+
     $subdir='';
     if ($extName) $subdir = 'thumbs/';
-    
+
     return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }

From 6df524bcb0278aba0f2915e6ffd5adba9d173599 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 1 Nov 2015 22:54:04 +0100
Subject: [PATCH 078/216] Remove blank page

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

diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 0e75daa26bd..7bb5a27a0c5 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -62,7 +62,7 @@ class modWebsite extends DolibarrModules
 
         // Config pages
         //-------------
-        $this->config_page_url = array("website.php");
+        $this->config_page_url = array();
 
         // Dependancies
         //-------------

From cc257d8abc4a80c191f05b2affb93290bec937db Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 1 Nov 2015 22:54:33 +0100
Subject: [PATCH 079/216] Typo

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

diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index ebe4b4c0342..9556a95b826 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -60,7 +60,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 // Search thirdparty
 if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 {
-	$listofsearchfields['search_thirdparty']=array('text'=>'Thirdparty');
+	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
 }
 // Search contact/address
 if (! empty($conf->societe->enabled) && $user->rights->societe->lire)

From d8f77f58d7c5e961442658ca4bc04f5f9e2444a1 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Mon, 2 Nov 2015 06:42:17 +0100
Subject: [PATCH 080/216] Salaries : Replace "label for" by the function
 fieldLabel & add some notes

---
 htdocs/compta/salaries/card.php | 54 ++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index e658633e7b0..969b840aeb9 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -201,7 +201,11 @@ if ($id)
 	}
 }
 
-// Formulaire saisie salaire
+/* ************************************************************************** */
+/*                                                                            */
+/* create mode                                                                */
+/*                                                                            */
+/* ************************************************************************** */
 if ($action == 'create')
 {
 	$year_current = strftime("%Y",dol_now());
@@ -231,50 +235,64 @@ if ($action == 'create')
 	
 	print '<table class="border" width="100%">';
 
-	print "<tr>";
-	print '<td class="fieldrequired"><label for="datep">'.$langs->trans("DatePayment").'</label></td><td>';
+	// 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>';
 
-	print '<tr><td><label for="datev">'.$langs->trans("DateValue").'</label></td><td>';
+	// 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>';
 
 	// Employee
-	print "<tr>";
-	print '<td class="fieldrequired"><label for="fk_user">'.$langs->trans("Employee").'</label></td><td>';
+	print '<tr><td>';
+	print fieldLabel('Employee','fk_user',1).'</td><td>';
 	print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
 	print '</td></tr>';
 
 	// Label
-	print '<tr><td class="fieldrequired"><label for="label">'.$langs->trans("Label").'</label></td><td><input name="label" id="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'"></td></tr>';
+	print '<tr><td>';
+	print fieldLabel('Label','label',1).'</td><td>';
+	print '<input name="label" id="label" size="40" value="'.($_POST["label"]?$_POST["label"]:$langs->trans("SalaryPayment")).'">';
+	print '</td></tr>';
 
-	print "<tr>";
-	print '<td class="fieldrequired"><label for="datesp">'.$langs->trans("DateStartPeriod").'</label></td><td>';
+	// Date start period
+	print '<tr><td>';
+	print fieldLabel('DateStartPeriod','datesp',1).'</td><td>';
 	print $form->select_date($datesp,"datesp",'','','','add');
 	print '</td></tr>';
 
-	print '<tr><td class="fieldrequired"><label for="dateep">'.$langs->trans("DateEndPeriod").'</label></td><td>';
+	// Date end period
+	print '<tr><td>';
+	print fieldLabel('DateEndPeriod','dateep',1).'</td><td>';
 	print $form->select_date($dateep,"dateep",'','','','add');
 	print '</td></tr>';
 
 	// Amount
-	print '<tr><td class="fieldrequired"><label for="amount">'.$langs->trans("Amount").'</label></td><td><input name="amount" id="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
+	print '<tr><td>';
+	print fieldLabel('Amount','amount',1).'</td><td>';
+	print '<input name="amount" id="amount" size="10" value="'.GETPOST("amount").'">';
+	print '</td></tr>';
 
 	// Bank
 	if (! empty($conf->banque->enabled))
 	{
-		print '<tr><td class="fieldrequired"><label for="selectaccountid">'.$langs->trans("Account").'</label></td><td>';
+		print '<tr><td>';
+		print fieldLabel('Account','selectaccountid',1).'</td><td>';
 		$form->select_comptes($_POST["accountid"],"accountid",0,'',1);  // Affiche liste des comptes courant
 		print '</td></tr>';
 	}
 
 	// Type payment
-	print '<tr><td class="fieldrequired"><label for="selectpaymenttype">'.$langs->trans("PaymentMode").'</label></td><td>';
+	print '<tr><td>';
+	print fieldLabel('PaymentMode','selectpaymenttype',1).'</td><td>';
 	$form->select_types_paiements(GETPOST("paymenttype"), "paymenttype");
-	print "</td>\n";
-	print "</tr>";
+	print '</td></tr>';
 
+	// Number
 	if (! empty($conf->banque->enabled))
 	{
 		// Number
@@ -304,7 +322,7 @@ if ($action == 'create')
 
 /* ************************************************************************** */
 /*                                                                            */
-/* Barre d'action                                                             */
+/* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -322,8 +340,8 @@ if ($id)
 	print $object->ref;
 	print '</td></tr>';
 
-	// Person
-	print '<tr><td>'.$langs->trans("Person").'</td><td>';
+	// Employee
+	print '<tr><td>'.$langs->trans("Employee").'</td><td>';
 	$usersal=new User($db);
 	$usersal->fetch($object->fk_user);
 	print $usersal->getNomUrl(1);

From 6fe43cbbeb3ff804608ed25968a3639e1d757dd9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 09:08:08 +0100
Subject: [PATCH 081/216] Removed dead code

---
 htdocs/core/lib/product.lib.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 8357f7a65ac..cb5201f59da 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -133,18 +133,6 @@ function product_prepare_head($object)
 	$head[$h][2] = 'documents';
 	$h++;
 
-
-	// More tabs from canvas
-	// TODO Is this still used ?
-	if (isset($object->onglets) && is_array($object->onglets))
-	{
-		foreach ($object->onglets as $onglet)
-		{
-			$head[$h] = $onglet;
-			$h++;
-		}
-	}
-
     complete_head_from_modules($conf,$langs,$object,$head,$h,'product', 'remove');
 
 	return $head;

From 3e752ed5c881db8a4fc7860c4d5de43a8621ac3b Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 09:46:21 +0100
Subject: [PATCH 082/216] Typo

---
 htdocs/core/actions_printing.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 030e7016a55..3744541dd0d 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -59,9 +59,9 @@ if ($action == 'print_file' and $user->rights->printing->read)
                 }
             }
         }
-        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warning');
+        if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null, 'warnings');
     } else {
-        setEventMessages($langs->trans("NoModuleFound"), null, 'warning');
+        setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
     }
     $action = '';
 }

From a161e6d47a687e348de4c416a02fbee2b6deaa81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 10:02:09 +0100
Subject: [PATCH 083/216] Continue debug of PRODUIT_MULTIPRICES option.
 Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
 relative caculation of multiprice not yet visible.

---
 htdocs/core/lib/product.lib.php        |  3 ++-
 htdocs/langs/en_US/admin.lang          |  1 +
 htdocs/langs/en_US/products.lang       |  3 ++-
 htdocs/product/admin/price_rules.php   | 33 ++++++++++++++++----------
 htdocs/product/class/product.class.php | 12 ++++++----
 htdocs/product/price.php               | 30 +++++++++++++----------
 6 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index cb5201f59da..69eb63717b2 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -155,7 +155,8 @@ function product_admin_prepare_head()
 	$head[$h][2] = 'general';
 	$h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+	if (!empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
+	{
 		$head[$h] = array(
 			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
 			1 => $langs->trans('MultipriceRules'),
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a4b7423ebe8..d5243b02bb2 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1708,3 +1708,4 @@ TitleExampleForMajorRelease=Example of message you can use to announce this majo
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
+MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 46cea209d3a..ddda0152245 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -69,6 +69,7 @@ ProductStatusNotOnBuyShort=Not for purchase
 UpdatePrice=Update price
 UpdateVAT=Update vat
 UpdateDefaultPrice=Update default price
+UpdateLevelPrices=Update prices for each level
 AppliedPricesFrom=Applied prices from
 SellingPrice=Selling price
 SellingPriceHT=Selling price (net of tax)
@@ -236,7 +237,7 @@ ProductsDashboard=Products/Services summary
 UpdateOriginalProductLabel=Modify original label
 HelpUpdateOriginalProductLabel=Allows to edit the name of the product
 MultipriceRules=Price level rules
-UseMultipriceRules=Use price level rules
+UseMultipriceRules=Use price level rules (defined into product module setup) to autocalculate prices of all other level according to first level
 PercentVariationOver=%% variation over %s
 PercentDiscountOver=%% discount over %s
 ### composition fabrication
diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php
index 76b907e14d4..83d90485b3d 100644
--- a/htdocs/product/admin/price_rules.php
+++ b/htdocs/product/admin/price_rules.php
@@ -1,6 +1,5 @@
 <?php
-
-/*
+/**
  * Copyright (C) 2015 Marcos García	<marcosgdf@gmail.com
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Page to set how to autocalculate price for each level when option
+ * PRODUCT_MULTIPRICE is on.
  */
 
 require '../../main.inc.php';
@@ -125,10 +127,16 @@ llxHeader('', $langs->trans('MultipriceRules'));
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($title,$linkback,'title_setup');
 
+
+
+print '<form method="POST">';
+
 $head = product_admin_prepare_head();
 dol_fiche_head($head, 'generator', $tab, 0, 'product');
 
-print load_fiche_titre($langs->trans('MultipriceRules'));
+print $langs->trans("MultiPriceRuleDesc").'<br><br>';
+
+print load_fiche_titre($langs->trans('MultipriceRules'), '', '');
 
 //Array that contains the number of prices available
 $price_options = array();
@@ -150,8 +158,6 @@ $genPriceOptions = function($level) use ($price_options) {
 
 ?>
 
-<form method="post">
-
 	<table class="noborder">
 		<tr class="liste_titre">
 			<td style="text-align: center"><?php echo $langs->trans('PriceLevel') ?></td>
@@ -184,13 +190,16 @@ $genPriceOptions = function($level) use ($price_options) {
 		<?php endfor ?>
 	</table>
 
-	<br>
+<?php 
 
-	<div style="text-align: center">
-		<input type="submit" value="<?php echo $langs->trans('Save') ?>" class="button">
-	</div>
-</form>
+dol_fiche_end();
 
-<?php
+print '<div style="text-align: center">
+		<input type="submit" value="'.$langs->trans('Save').'" class="button">
+	</div>';
+	
+print '</form>';
 
-llxFooter();
\ No newline at end of file
+llxFooter();
+
+$db->close();
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8ac288e71bf..dcf8661466c 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1344,10 +1344,10 @@ class Product extends CommonObject
 	 *  @param		int		$level			0=standard, >0 = level if multilevel prices
 	 *  @param     	int		$newnpr         0=Standard vat rate, 1=Special vat rate for French NPR VAT
 	 *  @param     	int		$newpsq         1 if it has price by quantity
-	 * @param int $ignore_autogen Used to avoid infinite loops
+	 *  @param 		int 	$ignore_autogen Used to avoid infinite loops
 	 * 	@return		int						<0 if KO, >0 if OK
 	 */
-	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen = 0)
+	function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen=0)
 	{
 		global $conf,$langs;
 
@@ -1362,9 +1362,10 @@ class Product extends CommonObject
 		// Check parameters
 		if ($newvat == '') $newvat=$this->tva_tx;
 
-		//If multiprices are enabled, then we check if the current product is subject to price autogeneration
-		//Price will be modified ONLY when the first one is the one that is being modified
-		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1)) {
+		// If multiprices are enabled, then we check if the current product is subject to price autogeneration
+		// Price will be modified ONLY when the first one is the one that is being modified
+		if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1)) 
+		{
 			return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpsq);
 		}
 
@@ -4024,6 +4025,7 @@ class Product extends CommonObject
 	{
 		global $conf, $db;
 
+		// FIXME USing * into select is forbidden
 		$sql = "SELECT * FROM ".MAIN_DB_PREFIX."product_pricerules";
 		$query = $db->query($sql);
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 4dfea1ca1ab..8822fd9f7f4 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -716,28 +716,30 @@ if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $
 {
 	print "\n" . '<div class="tabsAction">' . "\n";
 
-	if (empty($conf->global->PRODUIT_MULTIPRICES))
+	if (empty($conf->global->PRODUIT_MULTIPRICES))	// For everyone, except multiprices
 	{
     	if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
     	}
 	}
-	else
+
+	if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+	{
+	    if ($user->rights->produit->creer || $user->rights->service->creer) {
+	 		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+	  	}
+	}
+	
+	if (! empty($conf->global->PRODUIT_MULTIPRICES))
 	{
 	    if ($user->rights->produit->creer || $user->rights->service->creer) {
     		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_vat&amp;id=' . $object->id . '">' . $langs->trans("UpdateVAT") . '</a></div>';
     	}
 	    
 	    if ($user->rights->produit->creer || $user->rights->service->creer) {
-    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateDefaultPrice") . '</a></div>';
+    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?action=edit_price&amp;id=' . $object->id . '">' . $langs->trans("UpdateLevelPrices") . '</a></div>';
     	}
 	}
-    if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-    {
-        if ($user->rights->produit->creer || $user->rights->service->creer) {
-    		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
-    	}
-    }
     
 	print "\n</div>\n";
 }
@@ -912,11 +914,16 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		</script>
 		<?php
 
+		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>';
+		}
+		
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
-		    if ($i > 1) print '<br>';
 		    
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+		    if ($i > 1) print '<br>';
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="update_price">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
@@ -928,9 +935,8 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			print '<table class="border" width="100%">';
 
 			// VAT
-			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
+			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))	// This option is kept for backward compatibility but has no sense
 			{
-				print '<tr><td>' . $langs->trans('UseMultipriceRules'). '</td><td><input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'></td></tr>';
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
 				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id);
 				print '</td></tr>';

From a658ff7e90f6a50170390af11ab72105d70c2297 Mon Sep 17 00:00:00 2001
From: All-3kcis <contact@all-3kcis.fr>
Date: Mon, 2 Nov 2015 10:26:07 +0100
Subject: [PATCH 084/216] add commit or rollback if error

---
 .../fourn/class/fournisseur.product.class.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index acbeba8a720..ef776342aa5 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -138,22 +138,21 @@ class ProductFournisseur extends Product
 
             dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
             $resql = $this->db->query($sql);
-            if ($resql)
-            {
-                $this->db->commit();
-                return 1;
-            }
-            else
+            if (!$resql)
             {
                 $this->error=$this->db->lasterror();
-                $this->db->rollback();
-                return -1;
+                $error++;
             }
         }
-        else
-        {
+
+        if (empty($error)){
+            $this->db->commit();
+            return 1;
+        }else{
+            $this->db->rollback();
             return -1;
         }
+
     }
 
 

From 1a0179dd1fb27d3dadc0a8862ae85cea367c20cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 11:08:36 +0100
Subject: [PATCH 085/216] More complete help

---
 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 9aeaf8d60e6..45dd9eb9450 100644
--- a/htdocs/langs/en_US/margins.lang
+++ b/htdocs/langs/en_US/margins.lang
@@ -24,7 +24,7 @@ StartDate=Start date
 EndDate=End date
 Launch=Start
 ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
+ForceBuyingPriceIfNullDetails=If cost/buy price not defined, and this option "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
 UseDiscountAsProduct=As a product
 UseDiscountAsService=As a service

From 20a18638664334f60727fa5d0eda72eb08aa4c8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 11:45:59 +0100
Subject: [PATCH 086/216] FIX IF autocomplete was set on thirdparty list, it
 was not possible to open list of extrafields.

---
 htdocs/core/class/extrafields.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4d9fec42bf9..99114bfaef1 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -739,10 +739,10 @@ class ExtraFields
 		elseif ($type == 'select')
 		{
 			$out = '';
-			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && ! $forcecombo)
+			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keysuffix.'options_'.$key.$keyprefix, array(), $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+				$out.= ajax_combobox($keysuffix.'options_'.$key.$keyprefix, array(), 0);
 			}
 
 			$out.='<select class="flat" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="options_'.$key.$keyprefix.'" '.($moreparam?$moreparam:'').'>';
@@ -760,10 +760,10 @@ class ExtraFields
 		elseif ($type == 'sellist')
 		{
 			$out = '';
-			if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
+			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				$out.= ajax_combobox($keysuffix.'options_'.$key.$keyprefix, array(), $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+				$out.= ajax_combobox($keysuffix.'options_'.$key.$keyprefix, array(), 0);
 			}
 
 			$out.='<select class="flat" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="options_'.$key.$keyprefix.'" '.($moreparam?$moreparam:'').'>';

From ba4f306c83260fff7c60fa2b110ce59f8fa70112 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Mon, 2 Nov 2015 11:50:14 +0100
Subject: [PATCH 087/216] FIX: Avoid changing the state to a thirdparty who
 shouldn't be contacted anymore

---
 htdocs/public/emailing/mailing-read.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 1e991305658..4aa388ecf24 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -72,13 +72,13 @@ if (! empty($tag))
 	$resql=$db->query($sql);
 
 	//Update status communication of thirdparty prospect
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
+	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read thirdparty : ".$sql, LOG_DEBUG);
 
 	$resql=$db->query($sql);
 
     //Update status communication of contact prospect
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
+	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 
 	$resql=$db->query($sql);

From 3c5903f75a2accf65eb0aa347d4ed2f8b8bed061 Mon Sep 17 00:00:00 2001
From: fmarcet <fmarcet@2byte.es>
Date: Mon, 2 Nov 2015 11:52:39 +0100
Subject: [PATCH 088/216] FIX: Contacts are not added to the list with the
 status "no contact"

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

diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 2508440c147..48252d22a6e 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -203,9 +203,9 @@ class MailingTargets    // This can't be abstract as it is used for some method
         //Update the status to show contact mail that don't want to be contacted anymore'
         $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
         $sql .= " SET statut=3";
-        $sql .= " WHERE fk_mailing=".$mailing_id." AND email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
+        $sql .= " WHERE fk_mailing=".$mailing_id." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
         $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe s ON s.fk_stcomm=-1 AND s.rowid=sc.fk_soc)";
-        $sql .= " AND source_type='contact'";
+        $sql .= "  OR no_email=1)";
         $result=$this->db->query($sql);
 
         dol_syslog(get_class($this)."::add_to_target: mailing update status to display contact mail that do not want to be contacted sql:".$sql);

From c119859696fd4b8d39cec8c752cb957ade71bfa3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 13:14:46 +0100
Subject: [PATCH 089/216] NEW The quick search box on left menu can also search
 into expense reports.

---
 htdocs/core/ajax/selectsearchbox.php  | 4 ++++
 htdocs/core/class/html.form.class.php | 1 +
 htdocs/langs/en_US/main.lang          | 1 +
 htdocs/projet/activity/perweek.php    | 1 +
 htdocs/theme/eldy/style.css.php       | 6 ++++++
 htdocs/theme/md/style.css.php         | 6 ++++++
 6 files changed, 19 insertions(+)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 0f00086dbf7..21f0241e402 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -107,6 +107,10 @@ if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CON
 {
 	$arrayresult['searchintocontract']=array('text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
 }
+if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
+{
+	$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?sall='.urlencode($search_boxvalue));
+}
 
 
 /* Do we really need this. We already have a select for users, and we should be able to filter into user list on employee flag 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a9f66d80f22..10f5fc25695 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4562,6 +4562,7 @@ class Form
 			    		},*/
 			    		cache: true
 			    	},
+			        dropdownCssClass: "css-'.$htmlname.'", 
 				    placeholder: "'.dol_escape_js($placeholder).'",
 			    	escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
 			    	minimumInputLength: '.$minimumInputLength.',
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 4837a966394..95a0a67a90e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -766,3 +766,4 @@ SearchIntoCustomerProposals=Customer proposals
 SearchIntoSupplierProposals=Supplier proposals
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contracts
+SearchIntoExpenseReports=Expense reports
\ No newline at end of file
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 6201c601d18..a8f531cc790 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.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');
 $mode=GETPOST("mode");
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 5bb00861ac2..c245fce73c8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -3533,6 +3533,12 @@ a span.select2-chosen
 {
 	background: #FFFFFF;
 }
+.select2-results {
+	max-height:	400px;
+}
+.css-searchselectcombo ul.select2-results {
+	max-height:	none;
+}
 .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index ab13c8a5f39..45a4f755a05 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3385,6 +3385,12 @@ a span.select2-chosen
 {
 	background: #FFFFFF;
 }
+.select2-results {
+	max-height:	400px;
+}
+.css-searchselectcombo ul.select2-results {
+	max-height:	none;
+}
 .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;

From 7b8a33adfe3da778793521ba2a954278f38eb0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 13:20:51 +0100
Subject: [PATCH 090/216] Update commonobject.class.php

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

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e87145b8443..907c9c7b46b 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1391,6 +1391,8 @@ abstract class CommonObject
     		if ($this->db->query($sql))
     		{
     			$this->mode_reglement_id = $id;
+    			// for supplier
+    			if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
     			return 1;
     		}
     		else
@@ -1431,6 +1433,8 @@ abstract class CommonObject
     		if ($this->db->query($sql))
     		{
     			$this->cond_reglement_id = $id;
+    			// for supplier
+    			if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
     			$this->cond_reglement = $id;	// for compatibility
     			return 1;
     		}

From c06c2d0464925ff0fe8c8982b434b23a2afd4a7a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 14:21:45 +0100
Subject: [PATCH 091/216] FIX #3841 creation of a task completed has not status
 set to finished by default

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

diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7fbac977d79..380ecd80943 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1204,7 +1204,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0)
 		{
             $out.='<a href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create';
             if (get_class($object) == 'Societe') $out.='&amp;socid='.$object->id;
-            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=-1">';
+            $out.=(! empty($objcon->id)?'&amp;contactid='.$objcon->id:'').'&amp;backtopage=1&amp;percentage=100">';
     		$out.=$langs->trans("AddAnAction").' ';
     		$out.=img_picto($langs->trans("AddAnAction"),'filenew');
     		$out.="</a>";

From d0d4c5e7f8a625badb0157badef4c9ae8dbe81dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 15:44:15 +0100
Subject: [PATCH 092/216] NEW The conditional IF into ODT templates works also
 on not defined var so we can show data only if defined. Close #3819

---
 htdocs/core/ajax/selectsearchbox.php |  8 ++++----
 htdocs/includes/odtphp/odf.php       | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 21f0241e402..10694adf8d7 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -99,14 +99,14 @@ if (! empty($conf->askpricesupplier->enabled) && empty($conf->global->MAIN_SEARC
 	$arrayresult['searchintosupplierpropal']=array('text'=>img_picto('','object_propal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/askpricesupplier/list.php?sall='.urlencode($search_boxvalue));
 }
 
-if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
-{
-	$arrayresult['searchintointervention']=array('text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
-}
 if (! empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
 {
 	$arrayresult['searchintocontract']=array('text'=>img_picto('','object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode($search_boxvalue));
 }
+if (! empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
+{
+	$arrayresult['searchintointervention']=array('text'=>img_picto('','object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode($search_boxvalue));
+}
 if (! empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
 {
 	$arrayresult['searchintoexpensereport']=array('text'=>img_picto('','object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?sall='.urlencode($search_boxvalue));
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 351a5969b14..0bc54416fd1 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -283,12 +283,25 @@ IMG;
 	 */
 	private function _parse($type='content')
 	{
+	    // Search all tags fou into condition to complete $this->vars, so we will proceed all tests even if not defined
+	    $reg='@\[!--\sIF\s([{}a-zA-Z_]+)\s--\]@smU';
+	    preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
+	    //var_dump($this->vars);exit;
+	    foreach($matches as $match)   // For each match, if there is no entry into this->vars, we add it
+		{
+		    if (! empty($match[1]) && ! isset($this->vars[$match[1]]))
+			{
+			    $this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			}
+	    }
+	    //var_dump($this->vars);exit;
+	    
 		// Conditionals substitution
 		// Note: must be done before static substitution, else the variable will be replaced by its value and the conditional won't work anymore
-		foreach($this->vars as $key => $value)
+	    foreach($this->vars as $key => $value)
 		{
 			// If value is true (not 0 nor false nor null nor empty string)
-			if($value)
+			if ($value)
 			{
 				// Remove the IF tag
 				$this->contentXml = str_replace('[!-- IF '.$key.' --]', '', $this->contentXml);

From 85af1404202e4441f83bf08dfbdea9ea283abbe1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 15:46:27 +0100
Subject: [PATCH 093/216] More complete example of odt template for invoices

---
 .../invoices/template_invoice.odt             | Bin 37996 -> 38351 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/install/doctemplates/invoices/template_invoice.odt b/htdocs/install/doctemplates/invoices/template_invoice.odt
index dad29a292efcae907c1af651f8caae0fba453ec1..925d9f087cdfcd447f7966dd14e6a88a4ec413f6 100644
GIT binary patch
delta 8864
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

delta 8598
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


From 3ba97627ff1be26f39ccb58b4382bfd4c89836d6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 15:50:03 +0100
Subject: [PATCH 094/216] FIX Default thirdparty when cloning invoice was not
 set.

---
 htdocs/compta/facture.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6368dd00831..9608bd87a0c 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2548,7 +2548,8 @@ else if ($id > 0 || ! empty($ref))
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
-		if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change && $object->statut >= 1) {
+		if ($object->type != Facture::TYPE_DEPOSIT && ! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $qualified_for_stock_change && $object->statut >= 1) 
+		{
 			$langs->load("stocks");
 			require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
@@ -2738,17 +2739,19 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 	// Clone confirmation
-	if ($action == 'clone') {
+	if ($action == 'clone') 
+	{
 		// Create an array for form
 		$formquestion = array(
 							// 'text' => $langs->trans("ConfirmClone"),
 							// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1)
-							array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company('', 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)));
+							array('type' => 'other','name' => 'socid','label' => $langs->trans("SelectThirdParty"),'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)));
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?facid=' . $object->id, $langs->trans('CloneInvoice'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	if (! $formconfirm) {
+	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;

From d714d324249e479dca2e1adf1946020b0eb61a13 Mon Sep 17 00:00:00 2001
From: fappels <francis.appels@yahoo.com>
Date: Mon, 2 Nov 2015 16:37:51 +0100
Subject: [PATCH 095/216] Fix always first warehouse in reassortlot

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

diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 9ebffd5673d..b2ac9fbcbec 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -345,7 +345,7 @@ if ($resql)
 
 		// Warehouse
 		print '<td>';
-		$warehousetmp->fetch($obj->fk_entrepot);
+		$warehousetmp->fetch($objp->fk_entrepot);
 		print $warehousetmp->getNomUrl(1);
 		print '</td>';
 		print '<td align="center">'.$objp->batch.'</td>';

From ebf6493987ebe87870be35d9c6724fe5a932bdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 17:31:03 +0100
Subject: [PATCH 096/216] Typo

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

diff --git a/htdocs/langs/en_US/salaries.lang b/htdocs/langs/en_US/salaries.lang
index 953a9c7540c..79dbeadf775 100644
--- a/htdocs/langs/en_US/salaries.lang
+++ b/htdocs/langs/en_US/salaries.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - users
+# Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
 Salary=Salary

From 76c89884ba2569a43c8cda54d6eb97911c5c1be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 17:32:02 +0100
Subject: [PATCH 097/216] Update resource.lang

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

diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang
index 32bdd92f884..c89edddec4b 100644
--- a/htdocs/langs/en_US/resource.lang
+++ b/htdocs/langs/en_US/resource.lang
@@ -1,4 +1,4 @@
-
+# Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Resources
 MenuResourceAdd=New resource
 MenuResourcePlanning=Resource planning

From f928062e2be9831fb51a2b9ea3ab4952a85519d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 17:56:00 +0100
Subject: [PATCH 098/216] FIX #3726 Better support for
 PRODUCT_USE_OLD_PATH_FOR_PHOTO

---
 htdocs/core/class/html.formfile.class.php     |  7 +++++-
 htdocs/core/lib/functions.lib.php             | 20 +++++++---------
 .../modules/propale/doc/pdf_azur.modules.php  |  4 ++--
 .../tpl/document_actions_pre_headers.tpl.php  |  9 ++++---
 htdocs/product/class/product.class.php        |  8 +++----
 htdocs/product/document.php                   | 24 ++++++++++++++-----
 6 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 59a418d73a2..48dc7a3ebf2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -820,7 +820,12 @@ class FormFile
 						if ($object->element == 'member') $relativepath=get_exdir($object->id,2,0,0,$object,'member').$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;
 					print '<tr '.$bc[$var].'>';
 					print '<td>';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 861bd766a83..df6b3d325c5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3744,13 +3744,14 @@ function yn($yesno, $case=1, $color=0)
 
 /**
  *	Return a path to have a directory according to object.
- *  Examples:       '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
- *  Examples:       'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
+ *  New usage:       $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'modulepart')
+ *  Old usage:       '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/"
+ *  Old usage:       'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/"
  *
- *	@param	string	$num            Id of object
- *	@param  int		$level		    Level of subdirs to return (1, 2 or 3 levels)
- * 	@param	int		$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0).
- *  @param  int		$withoutslash   0=With slash at end, 1=without slash at end (except if '/', we return '')
+ *	@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)
+ * 	@param	int		$alpha		    0=Keep number only to forge path, 1=Use alpha part afer the - (By default, use 0). (deprecated, global option will be used in future)
+ *  @param  int		$withoutslash   0=With slash at end (except if '/', we return ''), 1=without slash at end
  *  @param	Object	$object			Object
  *  @param	string	$modulepart		Type of object ('invoice_supplier, 'donation', 'invoice', ...')
  *  @return	string					Dir to use ending. Example '' or '1/' or '1/2/'
@@ -3761,10 +3762,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 
 	$path = '';
 
-	// TODO if object is null, load it from id and modulepart.
-
-
-	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier','product')))
+	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier')))
 	{
 		// 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);
@@ -3778,7 +3776,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 	{
 		// TODO
 		// We will introduce here a common way of forging path for document storage
-		// Here, $num=id, ref and modulepart are required.
+		// Here, object->id, object->ref and object->modulepart are required.
 
 	}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 7fb02fe0514..30ace6e38ea 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -181,11 +181,11 @@ class pdf_azur extends ModelePDFPropales
 				if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 				{
 					$pdir[0] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";
-					$pdir[1] = dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir[1] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';
 				}
 				else
 				{
-					$pdir[0] = dol_sanitizeFileName($objphoto->ref).'/';				// default
+					$pdir[0] = get_exdir(0,0,0,0,$objphoto,'product') . dol_sanitizeFileName($objphoto->ref).'/';				// default
 					$pdir[1] = get_exdir($objphoto->id,2,0,0,$objphoto,'product') . $objphoto->id ."/photos/";	// alternative
 				}
 
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
index 1e4dbc7c5bb..4afb7959672 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_pre_headers.tpl.php
@@ -18,6 +18,7 @@
  */
 
 // Variable $upload_dir must be defined when entering here
+// Variable $upload_dirold may also exists.
 
 // Send file/link
 if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
@@ -54,16 +55,18 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		{
        		$urlfile=basename($urlfile);
 			$file = $upload_dir . "/" . $urlfile;
+			if (! empty($upload_dirold)) $fileold = $upload_dirold . "/" . $urlfile;
 		}
         $linkid = GETPOST('linkid', 'int');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
         if ($urlfile)
         {
-	        $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
-	        $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
+	        $dir = dirname($file).'/';     // Chemin du dossier contenant l'image d'origine
+	        $dirthumb = $dir.'/thumbs/';   // Chemin du dossier contenant la vignette
 
             $ret = dol_delete_file($file, 0, 0, 0, $object);
-
+            if (! empty($fileold)) dol_delete_file($fileold, 0, 0, 0, $object);     // Delete file using old path
+            
 	        // Si elle existe, on efface la vignette
 	        if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i',$file,$regs))
 	        {
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3496773e018..4253d2c0e48 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3411,7 +3411,7 @@ class Product extends CommonObject
 
 		$dir = $sdir;
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos";
-		else $dir .= '/'.dol_sanitizeFileName($this->ref);
+		else $dir .= '/'.get_exdir(0,0,0,0,$this,'product').dol_sanitizeFileName($this->ref);
 
 		dol_mkdir($dir);
 
@@ -3449,7 +3449,7 @@ class Product extends CommonObject
 
 		$dir = $sdir;
 		if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $dir .= '/'. get_exdir($this->id,2,0,0,$this,'product') . $this->id ."/photos/";
-		else $dir .= '/'.dol_sanitizeFileName($this->ref).'/';
+		else $dir .= '/'.get_exdir(0,0,0,0,$this,'product').dol_sanitizeFileName($this->ref).'/';
 
 		$nbphoto=0;
 
@@ -3500,8 +3500,8 @@ class Product extends CommonObject
 		}
 		else
 		{
-			$dir .= $this->ref.'/';
-			$pdir .= $this->ref.'/';
+			$dir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
+			$pdir .= get_exdir(0,0,0,0,$this,'product').$this->ref.'/';
 		}
 
 		$dirthumb = $dir.'thumbs/';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index a85f5d08cd8..ea16a13582c 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -70,10 +70,14 @@ if ($id > 0 || ! empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/';
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/';
-	if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $upload_dir.= get_exdir($object->id,2,0,0,$object,'product').$object->id."/photos";
-	else $upload_dir.= dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product').dol_sanitizeFileName($object->ref);
+    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $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";
+	    else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2),1,1).'/'.substr(substr("000".$object->id, -2),0,1).'/'.$object->id."/photos";
+	}
 }
 $modulepart='produit';
 
@@ -177,12 +181,19 @@ 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);
+
+	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);
+		$filearray=array_merge($filearray, $filearrayold);
+	}
+	
 	$totalsize=0;
 	foreach($filearray as $key => $file)
 	{
 		$totalsize+=$file['size'];
 	}
-
+	
 
     print '<table class="border" width="100%">';
 
@@ -235,7 +246,8 @@ if ($object->id)
     	$filearray = dol_dir_list($upload_dir, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
 
     	// For each file build select list with PDF extention
-    	if (count($filearray) > 0) {
+    	if (count($filearray) > 0) 
+    	{
     		print '<br>';
     		// Actual file to merge is :
     		if (count($filetomerge->lines) > 0) {

From ccb69d313c3d9848ac9794d0e7be3dc493f42fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 18:18:00 +0100
Subject: [PATCH 099/216] Fix Can't edit DictionaryRevenueStamp

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 817019cc24b..6fe2e8efb38 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -522,8 +522,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $ok=1;
     foreach ($listfield as $f => $value)
     {
-        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes'))) continue;		// For some pages, country is not mandatory
-    	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
+        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) 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;

From 055fe5e2756e13b991a953b2efacc58f5ee88def Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 19:17:22 +0100
Subject: [PATCH 100/216] FIX #3786 Translation of select box.

---
 htdocs/core/js/select2_locale.js.php | 64 ++++++++++++++++++++++++++++
 htdocs/langs/en_US/main.lang         |  8 +++-
 htdocs/main.inc.php                  |  1 +
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/core/js/select2_locale.js.php

diff --git a/htdocs/core/js/select2_locale.js.php b/htdocs/core/js/select2_locale.js.php
new file mode 100644
index 00000000000..2600182dfa1
--- /dev/null
+++ b/htdocs/core/js/select2_locale.js.php
@@ -0,0 +1,64 @@
+<?php
+/* Copyright (C) 2012	Regis Houssin		<regis.houssin@capnetworks.com>
+ * Copyright (C) 2012	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/js/timepicker.js.php
+ * \brief      File that include javascript functions for timepicker
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
+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);
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+
+session_cache_limiter(FALSE);
+
+require_once '../../main.inc.php';
+
+// Define javascript type
+header('Content-type: 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');
+?>
+
+/**
+ * Select2 French translation
+ */
+(function ($) {
+    "use strict";
+
+    $.fn.select2.locales['xx'] = {
+        formatMatches: function (matches) { return matches + " <?php echo dol_escape_js($langs->trans("Select2ResultFoundUseArrows")); ?>"; },
+        formatNoMatches: function () { return "<?php echo dol_escape_js($langs->trans("Select2NotFound")); ?>"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length; return "<?php echo dol_escape_js($langs->trans("Select2Enter")); ?> " + n + " <?php echo dol_escape_js($langs->trans("Select2MoreCharacters")); ?>"; },
+        formatLoadMore: function (pageNumber) { return "<?php echo dol_escape_js($langs->trans("Select2LoadingMoreResults")); ?>"; },
+        formatSearching: function () { return "<?php echo dol_escape_js($langs->trans("Select2SearchInProgress")); ?>"; }
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['xx']);
+})(jQuery);
+
+<?php
+if (is_object($db)) $db->close();
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 404801c5335..a60b3ddb21b 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -747,4 +747,10 @@ ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
 SelectMailModel=Select email template
-SetRef=Set ref
\ No newline at end of file
+SetRef=Set ref
+Select2ResultFoundUseArrows=
+Select2NotFound=No result found
+Select2Enter=Enter
+Select2MoreCharacters=or more characters
+Select2LoadingMoreResults=Loading more results...
+Select2SearchInProgress=Search in progress...
\ No newline at end of file
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 92d421d42cb..73abcfbf38b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1197,6 +1197,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             {
             	$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'.($ext?'?'.$ext:'').'"></script>'."\n";
             }
             // jQuery jMobile
             if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0))

From b8ffa564974bc3cea3673d898e4b3f0d0c93e91c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 19:49:00 +0100
Subject: [PATCH 101/216] Fix #3857

---
 htdocs/core/lib/pdf.lib.php | 265 +++++++++---------------------------
 1 file changed, 61 insertions(+), 204 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4991a75bb8f..b2b4ac12677 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1261,6 +1261,7 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1269,13 +1270,13 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinenum',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		return $hookmanager->resPrint;
+		$result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		return dol_htmlentitiesbr($object->lines[$i]->num);
+		$result.=dol_htmlentitiesbr($object->lines[$i]->num);
 	}
-	return '';
+	return $result;
 }
 
 
@@ -1293,6 +1294,7 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1301,13 +1303,13 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		return $hookmanager->resPrint;
+		$result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		return dol_htmlentitiesbr($object->lines[$i]->product_ref);
+		$result.=dol_htmlentitiesbr($object->lines[$i]->product_ref);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1324,6 +1326,7 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1332,13 +1335,13 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-		return $hookmanager->resPrint;
+		$result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		return dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
+		$result.=dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1354,6 +1357,7 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
+	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
@@ -1364,13 +1368,13 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
+		if (empty($hidedetails) || $hidedetails > 1) $result.=vatrate($object->lines[$i]->tva_tx,1,$object->lines[$i]->info_bits,1);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1389,6 +1393,7 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 	$sign=1;
 	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
+	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
@@ -1398,18 +1403,14 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-<<<<<<< HEAD
 		
-		if (!empty($hookmanager->resPrint)) print $hookmanager->resPrint;
-=======
-		return $hookmanager->resPrint;
->>>>>>> refs/remotes/origin/3.8
+		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->subprice, 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * $object->lines[$i]->subprice, 0, $outputlangs);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1425,6 +1426,7 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
+	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
@@ -1434,18 +1436,14 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-<<<<<<< HEAD
 		
-		if (!empty($hookmanager->resPrint)) print $hookmanager->resPrint;
-=======
-		return $hookmanager->resPrint;
->>>>>>> refs/remotes/origin/3.8
+		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
+		if (empty($hidedetails) || $hidedetails > 1) $result.=price(($object->lines[$i]->subprice) + ($object->lines[$i]->subprice)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1461,41 +1459,25 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 {
 	global $hookmanager;
 
+	$result='';
 	$reshook=0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-<<<<<<< HEAD
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-		else return $reshook;
-=======
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty;
-		}
->>>>>>> refs/remotes/origin/3.8
+		if(!empty($hookmanager->resPrint)) $result=$hookmanager->resPrint;
 	}
     if (empty($reshook))
 	{
 	   if ($object->lines[$i]->special_code == 3) return '';
-	   if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty;
+	   if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty;
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1512,39 +1494,24 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-<<<<<<< HEAD
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 	
-		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-=======
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_asked;
-		}
->>>>>>> refs/remotes/origin/3.8
+		if (!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-        if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_asked;
+        if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_asked;
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1561,39 +1528,24 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-<<<<<<< HEAD
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-=======
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_shipped;
-		}
->>>>>>> refs/remotes/origin/3.8
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->qty_shipped;
+	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->qty_shipped;
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1610,39 +1562,24 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 	global $hookmanager;
 
 	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-<<<<<<< HEAD
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-=======
-		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
-		}
->>>>>>> refs/remotes/origin/3.8
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) return ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+		if (empty($hidedetails) || $hidedetails > 1) $result.=($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1658,36 +1595,15 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false)
 {
 	global $langs;
-<<<<<<< HEAD
 	
 	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-=======
-	if ($object->lines[$i]->special_code != 3) {
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
-			$special_code = $object->lines[$i]->special_code;
-			if (!empty($object->lines[$i]->fk_parent_line)) {
-				$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			}
-			$parameters = array(
-				'i' => $i,
-				'outputlangs' => $outputlangs,
-				'hidedetails' => $hidedetails,
-				'special_code' => $special_code
-			);
-			$action = '';
-			$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		} else {
-			if (empty($hidedetails) || $hidedetails > 1) {
-				return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
-			}
->>>>>>> refs/remotes/origin/3.8
 		}
 		$parameters = array(
 			'i' => $i,
@@ -1698,14 +1614,14 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 			
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	    if (empty($hidedetails) || $hidedetails > 1) $result.=$langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
 	}
-	return '';
+	return $result;
 }
 
 
@@ -1725,39 +1641,24 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
-<<<<<<< HEAD
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
 		$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-=======
-		if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
-		}
->>>>>>> refs/remotes/origin/3.8
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) return dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
+	    if (empty($hidedetails) || $hidedetails > 1) $result.=dol_print_reduction($object->lines[$i]->remise_percent,$outputlangs);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1772,9 +1673,9 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-<<<<<<< HEAD
 	$reshook=0;
-	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
+    $result='';
+    //if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
 		$special_code = $object->lines[$i]->special_code;
@@ -1784,26 +1685,13 @@ function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookm
 		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
 		
 		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
-=======
-	if ($object->lines[$i]->special_code != 3) {
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
-			$special_code = $object->lines[$i]->special_code;
-			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
-			$action = '';
-			$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		} else {
-			if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
-		}
->>>>>>> refs/remotes/origin/3.8
 	}
 	if (empty($reshook))
 	{
         if ($object->lines[$i]->special_code == 3) return '';
-	    if (empty($hidedetails) || $hidedetails > 1) return $object->lines[$i]->situation_percent . '%';
+	    if (empty($hidedetails) || $hidedetails > 1) $result.=$object->lines[$i]->situation_percent . '%';
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1823,6 +1711,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 	if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
 	$reshook=0;
+	$result='';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 	{
@@ -1832,33 +1721,17 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
     if (empty($reshook))
 	{
-<<<<<<< HEAD
 	    if ($object->lines[$i]->special_code == 3)
     	{
     		return $outputlangs->transnoentities("Option");
     	}
-        if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
-=======
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
-		}
->>>>>>> refs/remotes/origin/3.8
+        if (empty($hidedetails) || $hidedetails > 1) $result.=price($sign * $object->lines[$i]->total_ht, 0, $outputlangs);
 	}
-	return '';
+	return $result;
 }
 
 /**
@@ -1884,33 +1757,17 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 		$action='';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 		
-		if(!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if(!empty($hookmanager->resPrint)) $result.=$hookmanager->resPrint;
 	}
 	if (empty($reshook))
 	{
-<<<<<<< HEAD
 		if ($object->lines[$i]->special_code == 3)
     	{
     		return $outputlangs->transnoentities("Option");
     	}
-		if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
-=======
-		if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
-		{
-			$special_code = $object->lines[$i]->special_code;
-			if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
-			$parameters = array('i'=>$i,'outputlangs'=>$outputlangs,'hidedetails'=>$hidedetails,'special_code'=>$special_code);
-			$action='';
-			$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-			return $hookmanager->resPrint;
-		}
-		else
-		{
-			if (empty($hidedetails) || $hidedetails > 1) return price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
-		}
->>>>>>> refs/remotes/origin/3.8
+		if (empty($hidedetails) || $hidedetails > 1) $result.=price(($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht)*($object->lines[$i]->tva_tx)/100, 0, $outputlangs);
 	}
-	return '';
+	return $result;
 }
 
 /**

From e9a0e10520f28f42e9a54481f8baf67a6da6ce99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 20:04:58 +0100
Subject: [PATCH 102/216] Remove travis log

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

diff --git a/.travis.yml b/.travis.yml
index 5d613e1dfca..7dea8765cb2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,7 +131,7 @@ script:
 # - cat upgrade370380.log
  - php upgrade2.php 3.7.0 3.8.0 ignoredbversion > upgrade370380-2.log
  - php upgrade.php 3.8.0 3.9.0 ignoredbversion > upgrade380390.log
- - cat upgrade380390.log
+# - cat upgrade380390.log
  - php upgrade2.php 3.8.0 3.9.0 ignoredbversion > upgrade380390-2.log
 # - cat upgrade380390-2.log
  - cd ../..

From e7ced322459a491da47798ff00017b56fdc487a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 18:18:00 +0100
Subject: [PATCH 103/216] Fix Can't edit DictionaryRevenueStamp

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 7cd094b32df..f48c0538c34 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -518,8 +518,8 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
     $ok=1;
     foreach ($listfield as $f => $value)
     {
-        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes'))) continue;		// For some pages, country is not mandatory
-    	if ($value == 'country' && in_array($tablib[$id],array('DictionaryCanton','DictionaryCompanyType'))) continue;		// For some pages, country is not mandatory
+        if ($value == 'country_id' && in_array($tablib[$id],array('DictionaryVAT','DictionaryRegion','DictionaryCompanyType','DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) 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;

From 563a020595dff0ff7ec5357a9390e85b2bc869de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 20:35:33 +0100
Subject: [PATCH 104/216] NEW Free text for cheque deposit receipt can be HTML
 content.

---
 htdocs/compta/paiement/cheque/card.php        |  5 ++-
 .../modules/cheque/pdf/pdf_blochet.class.php  | 42 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index bf6ed4f807a..803787589fe 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -779,7 +779,7 @@ print '<div class="tabsAction">';
 
 if ($user->societe_id == 0 && ! empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
 {
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Valid').'</a>';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
 }
 
 if ($user->societe_id == 0 && ! empty($object->id) && $user->rights->banque->cheque)
@@ -806,6 +806,7 @@ if ($action != 'new')
 }
 
 
-$db->close();
 
 llxFooter();
+
+$db->close();
diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
index dd6732d9742..85e69a23cf1 100644
--- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
@@ -376,7 +376,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		//$showdetails=0;
-		//return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		return pdf_pagefoot($pdf,$outputlangs,'BANK_CHEQUERECEIPT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
 		$marge_basse=$this->marge_basse;
 		$marge_gauche=$this->marge_gauche;
@@ -388,7 +388,45 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->SetFont('','', $default_font_size - 3);
 		$pdf->SetDrawColor(224,224,224);
 
+		// The start of the bottom of this page footer is positioned according to # of lines
+    	$freetextheight=0;
+    	if ($line)	// Free text
+    	{
+    		//$line="eee<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
+    	    if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+    		{
+    			$width=20000; $align='L';	// By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
+        		if (! empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
+        			$width=200; $align='C';
+        		}
+    		    $freetextheight=$pdf->getStringHeight($width,$line);
+    		}
+    		else
+    		{
+                $freetextheight=pdfGetHeightForHtmlContent($pdf,dol_htmlentitiesbr($line, 1, 'UTF-8', 0));      // New method (works for HTML content)
+                //print '<br>'.$freetextheight;exit;
+    		}
+    	}
+
+		$marginwithfooter=$marge_basse + $freetextheight;
+    	$posy=$marginwithfooter+0;
+    
+    	if ($line)	// Free text
+    	{
+    		$pdf->SetXY($dims['lm'],-$posy);
+    		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
+    		{
+                $pdf->MultiCell(0, 3, $line, 0, $align, 0);
+    		}
+    		else
+    		{
+                $pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk']-$marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
+    		}
+    		$posy-=$freetextheight;
+    	}
+    	
 		// On positionne le debut du bas de page selon nbre de lignes de ce bas de page
+		/*
 		$nbofline=dol_nboflines_bis($line,0,$outputlangs->charset_output);
 		//print 'e'.$line.'t'.dol_nboflines($line);exit;
 		$posy=$marge_basse + ($nbofline*3);
@@ -398,7 +436,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 			$pdf->SetXY($marge_gauche,-$posy);
 			$pdf->MultiCell(20000, 3, $line, 0, 'L', 0);	// Use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
 			$posy-=($nbofline*3);	// 6 of ligne + 3 of MultiCell
-		}
+		}*/
 
 		$pdf->SetY(-$posy);
 		$pdf->line($marge_gauche, $page_hauteur-$posy, 200, $page_hauteur-$posy);

From 1bcda200e3396d61928add2965b438bbbbe4c958 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 20:48:27 +0100
Subject: [PATCH 105/216] A module to setup OAuth. OK, but what to do once
 setup of a client id/secret is done ?

---
 htdocs/admin/oauth.php                 | 9 +++++----
 htdocs/core/modules/modOauth.class.php | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 6283d78d95e..4b3525fa803 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -323,13 +323,14 @@ foreach ($list as $key)
 
 }
 
-print '</tr>';
-
-print '</form>';
 print '</table>'."\n";
 
-print '<br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 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/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index c2c164d81a6..c77ab6de68e 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -30,7 +30,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
 
 /**
- *  Class to describe and activate module Direct Printing
+ *  Class to describe and activate module OAuth
  */
 class modOauth extends DolibarrModules
 {
@@ -50,8 +50,8 @@ class modOauth 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 = "Enable Oauth.";
-        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $this->description = "Enable OAuth authentication";
+        $this->version = 'development';    // 'development' or 'experimental' or 'dolibarr' or version
         $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;
@@ -93,7 +93,7 @@ class modOauth extends DolibarrModules
         // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
         $r++;
-        $this->rights[$r][0] = 66001;
+        $this->rights[$r][0] = 66000;
         $this->rights[$r][1] = 'OauthAccess';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 1;

From cd68ea9d0fbe8506f220b778d51fc4ee13bddbed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 21:42:11 +0100
Subject: [PATCH 106/216] Fix: We must use external URL for OAuth.

---
 htdocs/admin/oauth.php                        | 27 ++++++++++++++++++-
 .../modules/printing/printgcp.modules.php     | 12 ++++++---
 htdocs/langs/en_US/oauth.lang                 |  2 ++
 htdocs/langs/en_US/printing.lang              |  2 ++
 htdocs/printing/admin/printing.php            |  7 +++--
 5 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 4b3525fa803..341cc3d75cd 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -294,7 +294,14 @@ print '<input type="hidden" name="action" value="update">';
 /*
  *  Parameters
  */
-dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
+dol_fiche_head(array(), '', '', 0, 'technic');
+
+
+// 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
+
 
 print '<table class="noborder" width="100%">';
 
@@ -307,6 +314,24 @@ foreach ($list as $key)
     $label = $langs->trans($key[0]); 
     print '<td colspan="2">'.$label.'</td></tr>';
 
+    if (in_array($key[0], array('OAUTH_GOOGLE_NAME')))
+    {
+        $redirect_uri=$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php';
+        $var = !$var;
+        print '<tr '.$bc[$var].' class="value">';
+        print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
+        print '<td><textarea style="width: 80%">'.$redirect_uri.'</textarea>';
+        print '</td></tr>';
+    }
+    else
+    {
+        $var = !$var;
+        print '<tr '.$bc[$var].' class="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">';
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index ab838270372..069762dde23 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -58,8 +58,13 @@ class printing_printgcp extends PrintingDriver
      */
     function __construct($db)
     {
-        global $conf;
+        global $conf, $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
+        
         $this->db = $db;
         $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
         $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
@@ -70,7 +75,7 @@ class printing_printgcp extends PrintingDriver
         $credentials = new Credentials(
             $this->google_id,
             $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php'
+            $urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php'
         );
         $access = ($storage->hasAccessToken('Google')?'HasAccessToken':'NoAccessToken');
         $serviceFactory = new \OAuth\ServiceFactory();
@@ -103,6 +108,7 @@ class printing_printgcp extends PrintingDriver
         if (!$conf->oauth->enabled) {
             $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'ModuleAuthNotActive', 'type'=>'info');
         } else {
+         
             if ($this->google_id != '' && $this->google_secret != '') {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
                 $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_ACCESS', 'info'=>$access, 'type'=>'info');
@@ -112,7 +118,7 @@ class printing_printgcp extends PrintingDriver
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info');
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(date("Y-m-d H:i:s", $token->getEndOfLife())), 'type'=>'info');
                 }
-                $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>DOL_MAIN_URL_ROOT.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+                $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
             } else {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
             }
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index a45f9920dea..ef58d605c49 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+NoAccessToken=No token access saved.
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 OAUTH_AMAZON_NAME=Api Amazon
 OAUTH_AMAZON_ID=Api Amazon Id
 OAUTH_AMAZON_SECRET=Api Amazon Secret
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index 81ee8071b2e..2e05349cfc8 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -81,3 +81,5 @@ STATE_IPP_none=None
 MEDIA_IPP_stationery=Stationery
 MEDIA_IPP_thermal=Thermal
 IPP_COLOR_print-black=BW Printer
+GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
+GoogleAuthConfigured=Google OAuth credentials found.
\ No newline at end of file
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 6a28f352578..2f7e2f2da7f 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/printing/lib/printing.lib.php';
 
 $langs->load("admin");
 $langs->load("printing");
+$langs->load("oauth");
 
 if (! $user->admin) accessforbidden();
 
@@ -178,15 +179,17 @@ if ($mode == 'setup' && $user->admin)
     }
 
     print '</table>';
+    
+    dol_fiche_end();
+    
     if (! empty($driver))
     {
         if ($submit_enabled) {
             print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
         }
     }
-    print '</form>';
-    dol_fiche_end();
 
+    print '</form>';
 }
 if ($mode == 'config' && $user->admin)
 {

From 12e11da6b47138a708ac8b3bcfdeb9499bd9c816 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 2 Nov 2015 21:44:52 +0100
Subject: [PATCH 107/216] Use better field

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

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index 341cc3d75cd..aab05bd4c56 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -320,7 +320,7 @@ foreach ($list as $key)
         $var = !$var;
         print '<tr '.$bc[$var].' class="value">';
         print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-        print '<td><textarea style="width: 80%">'.$redirect_uri.'</textarea>';
+        print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
         print '</td></tr>';
     }
     else

From ea0bf44670477e2eb8ef5ee7f522837760083dca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 09:43:39 +0100
Subject: [PATCH 108/216] The ckecksum file should not be into sources. Only
 into packages.

---
 htdocs/install/filelist.xml | 13363 ----------------------------------
 1 file changed, 13363 deletions(-)
 delete mode 100644 htdocs/install/filelist.xml

diff --git a/htdocs/install/filelist.xml b/htdocs/install/filelist.xml
deleted file mode 100644
index 0484184115b..00000000000
--- a/htdocs/install/filelist.xml
+++ /dev/null
@@ -1,13363 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<checksum_list version="3.8.1">
-<dolibarr_htdocs_dir>
-<dir name="/opensurvey/css" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css">75d01810c3b8e5a95cbf57f10cd5021b</md5file>
-</dir>
-<dir name="/opensurvey" >
-<md5file name="results.php">2b63072e8314cb7e4b936c457ff8437e</md5file>
-<md5file name="exportcsv.php">67798229e915f5841274ee70487feec4</md5file>
-<md5file name="card.php">e3634943f8374be65b59bb08cb8975c0</md5file>
-</dir>
-<dir name="/opensurvey/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="opensurveysondage.class.php">fe8968597576694701ac27172db9fc79</md5file>
-</dir>
-<dir name="/opensurvey/wizard" >
-<md5file name="choix_date.php">6734d43389eded6e6ec04df0d0ac6a0c</md5file>
-<md5file name="create_survey.php">b8ba9640c14960e0d4a5fc1065c8ed3d</md5file>
-<md5file name="choix_autre.php">8948df2f592a82d0f5e8a9b438267127</md5file>
-<md5file name="index.php">aa62843d604aa6a058bc2a342a3f4abf</md5file>
-</dir>
-<dir name="/opensurvey" >
-<md5file name="fonctions.php">9f5b847472c19606e9ffc71373ebc1ec</md5file>
-<md5file name="index.php">e96ac27ffffd6c056faada99f2238a59</md5file>
-<md5file name="list.php">2848bc03343a8855143addb33c993024</md5file>
-</dir>
-<dir name="/opensurvey/img" >
-<md5file name="next.png">6d57fc3e3529573832640f2d8f5431fa</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_opensurvey.png">8aab867ba0d3ae540ed3ba143a9ac209</md5file>
-<md5file name="opensurvey.png">441a6eda734c5b5275784b0feddd4f4a</md5file>
-<md5file name="accept-24.png">af84e26d495c27b0132cf3b565c756a7</md5file>
-<md5file name="calendar-32.png">0edc7dc4e4eca0cf7e2a016ea4fc38a4</md5file>
-<md5file name="add-24.png">cec7bbbcd81cb1fe36e5b49ee36b7dea</md5file>
-<md5file name="cancel.png">757aa607cbcd1616ced5a336e56b0e6c</md5file>
-<md5file name="medaille.png">c3da79f5f54f904a89becbfdd77d0dd0</md5file>
-<md5file name="date.png">90748eec5b2aa7985d2792bf470d6c90</md5file>
-<md5file name="previous.png">c27047f9fee70ff22fd43c59f4b9a612</md5file>
-<md5file name="chart-32.png">765552dbd7152ea2877eec94be358555</md5file>
-<md5file name="sondage2.png">efb7978f299dada5666d9cb924790493</md5file>
-<md5file name="add-16.png">83168a773a55c95c061c4f8e0acfd1a0</md5file>
-<md5file name="accept.png">c6274cd0dfefaab01570605b5175d36e</md5file>
-<md5file name="fforward.png">1faa9edc4b6caae44e72683642199927</md5file>
-<md5file name="rewind.png">6877820eee61e7159f1b50d17b63c2df</md5file>
-</dir>
-<dir name="/support" >
-<md5file name="default.css">e9744918d6277c1403a7c1cbe42b12f7</md5file>
-<md5file name="mail.png">6c5b043b72d32408f4002090e802d6e8</md5file>
-<md5file name="helpcenter.png">f994d768919712c348a9f4018c6d4ee5</md5file>
-<md5file name="internet.png">e7a0c91845d001672e8238f4f4b608c7</md5file>
-<md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
-<md5file name="sparkangels.png">73e54239e073c5e776f0c9b0318ba330</md5file>
-<md5file name="index.php">9f557f8d1c3e22bcd014bc5082aa6f3c</md5file>
-<md5file name="redstar.png">78f3bac5801105879cebaeb0bdcbb03b</md5file>
-<md5file name="who.png">313274ccfbc6586080382c481cd00264</md5file>
-<md5file name="pagemaster.png">a7288deb697b6946baff286db59b738d</md5file>
-<md5file name="inc.php">6c6185d0031ae718c1909e3c04d1fcc3</md5file>
-<md5file name="background.png">7b2ad6fb7dc44d8a84517cd164a3883d</md5file>
-<md5file name="online.php">4aed9d2cb22a7353d72fc8355de5342d</md5file>
-</dir>
-<dir name="/ecm" >
-<md5file name="docmine.php">de36a72317540bb861c69aa3aa246a29</md5file>
-<md5file name="docdir.php">54d476f65c25daed84640cb24336ded0</md5file>
-<md5file name="docfile.php">43a4b52b9b9e90f95b6102d2f561295e</md5file>
-</dir>
-<dir name="/ecm/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="enablefiletreeajax.tpl.php">7aba69716e92939377bccee8b5c4ada2</md5file>
-</dir>
-<dir name="/ecm/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="ecmdatabase.php">d80628560310197b51451941990f41a5</md5file>
-</dir>
-<dir name="/ecm" >
-<md5file name="index_auto.php">7620d3c593e0756c6a52a14be719fa4a</md5file>
-<md5file name="docother.php">9f008f58c3338ecfd47392eaa38db8d9</md5file>
-</dir>
-<dir name="/ecm/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="ecmdirectory.class.php">a0a3d92196fb3d14f1a8e32686c4e8f7</md5file>
-<md5file name="htmlecm.form.class.php">e7063a977fb2302b64681468ccc5ac2f</md5file>
-</dir>
-<dir name="/ecm" >
-<md5file name="search.php">bc640abf203b20a3e9d3e3d456b44f3b</md5file>
-<md5file name="index.php">9526e47774ea9c97832d4bb5fe000376</md5file>
-</dir>
-<dir name="/imports/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="import.class.php">148ea77f922122bea3bd1bb5a3471568</md5file>
-</dir>
-<dir name="/imports" >
-<md5file name="index.php">604a3c1fd670af360b4e8dd070316b32</md5file>
-<md5file name="import.php">1d9d76e09b19523c85101bbe153e1c97</md5file>
-<md5file name="emptyexample.php">08194ccdf2c8801e9ce4acd3fc6a8829</md5file>
-</dir>
-<dir name="/admin" >
-<md5file name="agenda_extsites.php">d0a6afda3d75393d3a09e43bb1135b87</md5file>
-<md5file name="dict.php">0f28a7630e864c959d4fb6d6f92304b0</md5file>
-<md5file name="barcode.php">a92b0b6374f698c980928a3bee17ff9a</md5file>
-<md5file name="ihm.php">92c1d275d0117efbece0312787a0736c</md5file>
-<md5file name="agenda.php">f8ba5662241d9c908f1f791f72481eb7</md5file>
-<md5file name="security.php">491d3762c5040d7f09f82be0b27ddbea</md5file>
-<md5file name="prelevement.php">7367da82258c07fb35aaf3aafd3e1bb7</md5file>
-<md5file name="order_extrafields.php">dd9cf0fdcd7a32f49882b31d894f9bcb</md5file>
-<md5file name="ecm.php">eb6e5f08d24f10bdb9f17e6da6f1df6e</md5file>
-<md5file name="security_other.php">4e708e91d45b1d44047b29cdd6768fa1</md5file>
-<md5file name="limits.php">ab1c40ca3be7e21725ce114881dc332b</md5file>
-</dir>
-<dir name="/admin/tools" >
-<md5file name="update.php">b702c4be259106f2e031a8d7a57462a9</md5file>
-<md5file name="export.php">ab13e413223fede4e27cdd0d5a112cd4</md5file>
-<md5file name="listsessions.php">876371cf283ebd2982d4cacc1640536c</md5file>
-<md5file name="dolibarr_import.php">c7db3ca4d5477082bd3251f7d02170ea</md5file>
-<md5file name="index.php">e3fa076bfc94a80430f9a32aee318da8</md5file>
-<md5file name="eaccelerator.php">c31f65e979da57d157bfb7ec4cdc65df</md5file>
-<md5file name="purge.php">2a13bfa6db4c63aeab46d3aa2beb353c</md5file>
-<md5file name="dolibarr_export.php">6e164b380b852fe7cd5ba652e651cecd</md5file>
-<md5file name="listevents.php">0e1e52293768d3b3be9bbe7eda4a07de</md5file>
-</dir>
-<dir name="/admin" >
-<md5file name="delais.php">9eb9f1b8f927ab504d4418b356dfe7c5</md5file>
-</dir>
-<dir name="/admin/menus" >
-<md5file name="edit.php">828de5d20d08feba47b7f29c75cd13ca</md5file>
-<md5file name="index.php">0dccae7621b59c1e1a30999d6cea6a2f</md5file>
-<md5file name="other.php">408203a970401705d1735235ba7be850</md5file>
-</dir>
-<dir name="/admin" >
-<md5file name="fichinter.php">f931df27f98e7f817c266281013860cb</md5file>
-<md5file name="perms.php">b3d708e374e21a5b90cd9b4fc0be482a</md5file>
-<md5file name="fckeditor.php">52c51ac0c1e841314d48328b7c32b7d3</md5file>
-<md5file name="salaries.php">9d56c5024279a4f5f9b799c6950f18ef</md5file>
-<md5file name="askpricesupplier.php">c07ed6242e02cf7244ca15d501b8efa7</md5file>
-<md5file name="supplier_invoice.php">9167ee0137e4d8e27a380b605409b0a0</md5file>
-<md5file name="confexped.php">c704d69e4e509d8fecd98259b4dc4696</md5file>
-<md5file name="ldap.php">0b5e44a54c9e9f7c5e5fb56cc7551aea</md5file>
-<md5file name="taxes.php">7d5a6b14598de5cea0cffe96a69eec7a</md5file>
-<md5file name="geoipmaxmind.php">7bfd53154d651a07bf5d6861b382d50a</md5file>
-<md5file name="boxes.php">7a48e375b7d77c532d3fad60186f1aa9</md5file>
-<md5file name="propal.php">7d63e6e9475d16e4599040b8a41a53fe</md5file>
-<md5file name="orderdet_extrafields.php">9e98b6ebcb40a3efd59fefe1647eb676</md5file>
-<md5file name="workflow.php">25439159688546129372ffb05788b0e3</md5file>
-<md5file name="commande.php">808060eafd55007016cda2fd9096cc95</md5file>
-<md5file name="sms.php">492dc95d5efe02dd3bca4574a8682830</md5file>
-<md5file name="translation.php">f61c878d3c2b9d7e12dc91384426b5c2</md5file>
-<md5file name="spip.php">116e9a092013cf1274f96985a620ce6c</md5file>
-<md5file name="expensereport.php">616208b226e5d0f544681f69cd65b19b</md5file>
-<md5file name="loan.php">9471d2c20faef2788d72085029d086ad</md5file>
-</dir>
-<dir name="/admin/system" >
-<md5file name="database-tables.php">1aa139c5f297ba65303cbb1dc6690044</md5file>
-<md5file name="xcache.php">3d004a3c15cd75a45126bace56f8e571</md5file>
-<md5file name="browser.php">7a603b1f2377ad48683ebd36121ee543</md5file>
-<md5file name="dbtable.php">1d4faf84da5cb7cf4ec45f41fca4c789</md5file>
-<md5file name="about.php">2695ed2349894ec554415bab0cb731ed</md5file>
-<md5file name="index.php">5d4aefbb80446c57442e7e7e45471c29</md5file>
-<md5file name="filecheck.php">f7aa8e26c09d03918937902ad4a44348</md5file>
-<md5file name="perf.php">34958e258b87fc1ec821e6b088e79c8d</md5file>
-<md5file name="xdebug.php">fd5d1d799fde0113ed7dfff59ce7f829</md5file>
-<md5file name="dolibarr.php">149760ed8fadcb899e8ba8e3e4a564c3</md5file>
-<md5file name="constall.php">f723e0514d0a3b56160b072da038081d</md5file>
-<md5file name="modules.php">67753ac07c72a9faac35bf474dd820ac</md5file>
-<md5file name="phpinfo.php">ef909e4522e762772f5f5ddc63d7ee05</md5file>
-<md5file name="web.php">5851d5e285e2ca13d469bd52bbdc7bc7</md5file>
-<md5file name="database.php">64b89438be28585863692b07b28d92c7</md5file>
-<md5file name="os.php">0dc61c4116c08c367e26b71502dead57</md5file>
-</dir>
-<dir name="/admin" >
-<md5file name="events.php">4eb6bf940da326c8d507b96e02441a30</md5file>
-<md5file name="triggers.php">e418c1f44e48e5d1efd949eec8854d41</md5file>
-<md5file name="agenda_other.php">9723236a5c42cbf2475ab9d61a904375</md5file>
-<md5file name="index.php">63a117bad7a888f3ec6afda0e7fd16c2</md5file>
-<md5file name="supplierinvoice_extrafields.php">b06bdb8f2eb308f51eac8eb213ce324a</md5file>
-<md5file name="supplierorderdet_extrafields.php">eb3573fcc14887e31aaf4f00800e1ab4</md5file>
-<md5file name="mailing.php">7b48253be9aaf706a214862fda962144</md5file>
-<md5file name="contract.php">2ebfa2593d94dad9c8f758780e48b529</md5file>
-<md5file name="facture.php">fe1caea2173bad3842ec90af117c7468</md5file>
-<md5file name="security_file.php">5c28e8fc82116d557114064745bad800</md5file>
-<md5file name="ldap_contacts.php">10d040f2d8710bfa077f96d7861d2445</md5file>
-<md5file name="expedition.php">c08cef9b254c721cbcf8d583715f3312</md5file>
-<md5file name="user.php">d4b44e7363df82a4d4ab909105c62b1c</md5file>
-<md5file name="pdf.php">7d5f0705f6492a926a558fa1ec2ad186</md5file>
-<md5file name="ldap_members.php">6dc5d10cfbdd1b0b194b44f8bb3b369d</md5file>
-<md5file name="mailman.php">a7520db2c94a8c640ac3566eea390071</md5file>
-<md5file name="stock.php">8d961f94da4667b144e1eb113c7874fa</md5file>
-<md5file name="livraison.php">4786d8e95b4fceb269f3d6a62ea66ef8</md5file>
-<md5file name="bank.php">01e7e410650ffc5f9877826e085b44a4</md5file>
-<md5file name="mails.php">8868b7d0779aa09e9b52c965e1e96b8a</md5file>
-<md5file name="notification.php">5c06b9772a487667c388ae2b5714fa91</md5file>
-<md5file name="syslog.php">b2e983fe3f64bb7ec0bd09a8d7225acc</md5file>
-<md5file name="company.php">f4852e3a84cb84e07ab5a08e082bdb69</md5file>
-<md5file name="menus.php">bc667a42f1ade75c59cb5ad6103847b7</md5file>
-<md5file name="const.php">d63455783346f56c804c166f71bf72b0</md5file>
-<md5file name="ldap_users.php">31bbae8a1de3e1fb630ac4d83db62d71</md5file>
-<md5file name="modules.php">77b0d9800746216db7aeb6d6ae97c120</md5file>
-<md5file name="external_rss.php">dffbd73d8de5768a2cc32565732dd9cc</md5file>
-<md5file name="supplier_order.php">9b9cdf0d964ecc76eddfbe5331c15c53</md5file>
-<md5file name="bank_extrafields.php">07b0a3d9980fdc81c37bfedb597204a6</md5file>
-<md5file name="supplierinvoicedet_extrafields.php">4bf3ac228b311e0cf07ef2fc4fc8037e</md5file>
-<md5file name="agenda_xcal.php">db66a55e69c3d86828051d75c0dedf1c</md5file>
-<md5file name="supplierorder_extrafields.php">15e33c41fec315a0dc8b0a1f4e08ce93</md5file>
-<md5file name="agenda_extrafields.php">deab2738e25782c55f8daefd0157de3e</md5file>
-<md5file name="clicktodial.php">ae8c315cfbe5998e5a067a09866e455b</md5file>
-<md5file name="ldap_groups.php">62a7d69cf85d612ce8df9956b6d9a77e</md5file>
-<md5file name="proxy.php">8a009d5933a9c9c35b01d210febb6e21</md5file>
-<md5file name="compta.php">a0024e1b8052eb2bc9bb8622b329cdb8</md5file>
-</dir>
-<dir name="/printing/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="printing.php">59cb9f641e231673bed98341a8208d40</md5file>
-</dir>
-<dir name="/printing" >
-<md5file name="index.php">667cd8a71a675fe06ea29427443e4642</md5file>
-</dir>
-<dir name="/printing/lib" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="printing.lib.php">638b941ae4b6d882194e84b826fe80d5</md5file>
-</dir>
-<dir name="/paypal" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/paypal/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paypal.php">c6fb4c534b13919a61a7cda2675182cd</md5file>
-</dir>
-<dir name="/paypal/lib" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paypal.lib.php">30dd0792cad95cf9efe1ad703856ff10</md5file>
-<md5file name="paypalfunctions.lib.php">296b5b4000a78d2b6641d6f87b54b1d5</md5file>
-</dir>
-<dir name="/paypal/img" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_paypal.png">b3557974ee09698bf75f5908dce5ede1</md5file>
-</dir>
-<dir name="/holiday" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="document.php">c3a091f382b8d46073d526656abafa08</md5file>
-<md5file name="card.php">9b3010ffba6af811bceb8d53ef7cd4a4</md5file>
-<md5file name="month_report.php">3e49a455e52720605b60a343d9c3fd3f</md5file>
-</dir>
-<dir name="/holiday/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="holiday.class.php">a345b7179b0b8624a64ac33dff310df8</md5file>
-</dir>
-<dir name="/holiday" >
-<md5file name="view_log.php">37ed710e40414cc35a8451695d101da9</md5file>
-<md5file name="common.inc.php">26c66f78f5db62e9af07cb11280afc24</md5file>
-<md5file name="list.php">1eb0907a7926acae06fd61b54c0d2bab</md5file>
-<md5file name="define_holiday.php">0dce719c0539bf9d75cbbdf3de32817f</md5file>
-</dir>
-<dir name="/holiday/img" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="edit.png">120b660df099ef9207e084810b95643b</md5file>
-<md5file name="add.png">a0765816715c1bbe18e9f87846a2b710</md5file>
-<md5file name="conges.png">28d24390fb0fc34b881439a3e1fde041</md5file>
-<md5file name="delete.png">f180d27636c3a69c402e244791499c59</md5file>
-</dir>
-<dir name="/includes" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/includes/chromephp" >
-<md5file name="composer.json">0d772a38306fde52cab75b8a42b45688</md5file>
-<md5file name="ChromePhp.php">b829e1c2687849a67387ad8e4c55404f</md5file>
-</dir>
-<dir name="/includes/adodbtime" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="adodb-time.inc.php">ef1cf954f3d42f0812e26142a6704e0c</md5file>
-</dir>
-<dir name="/includes/php-iban" >
-<md5file name="oophp-iban.php">aace231a5cfec37aceaf64e87a6985e4</md5file>
-<md5file name="php-iban.php">562e10fdf9aceb3c277f6d9b13d98fc1</md5file>
-</dir>
-<dir name="/includes/ckeditor" >
-<md5file name="build-config.js">4c09ead3612beefe457740591551f103</md5file>
-<md5file name="ckeditor.js">05a2e51b59ec243e96c710c5a05462f6</md5file>
-</dir>
-<dir name="/includes/ckeditor/skins/moono" >
-<md5file name="editor_ie8.css">a05ff7085b07193b2c2e8222b4a049b5</md5file>
-<md5file name="dialog_ie8.css">6ddc99ed13c9297a09bd1dbebc2685b8</md5file>
-<md5file name="dialog_opera.css">3ce8b7b6c087edc1b162861dcf29ee60</md5file>
-<md5file name="editor_iequirks.css">7fe43f107fd4873f0b7a4750888b0e7d</md5file>
-<md5file name="dialog_iequirks.css">618e818af8dea17de322d782157dce72</md5file>
-<md5file name="dialog_ie7.css">1e0c1dc858a4dc5d57c6f5dc4beff437</md5file>
-<md5file name="dialog_ie.css">bd499cdcff25d83aefa453d16327fb31</md5file>
-<md5file name="icons.png">bfa0bba21e124aa73b63eae9b9a6c47f</md5file>
-<md5file name="dialog.css">4be815e975625b73ee6e925d97b9d1cf</md5file>
-</dir>
-<dir name="/includes/ckeditor/skins/moono/images" >
-<md5file name="arrow.png">1736b2041754ba66b0f078d8e1abaff2</md5file>
-<md5file name="refresh.png">669da5a688185e4b472e7c0d8166d149</md5file>
-</dir>
-<dir name="/includes/ckeditor/skins/moono/images/hidpi" >
-<md5file name="refresh.png">b2b0dd629761bfc7fd5b8d2d3ed167f7</md5file>
-<md5file name="lock-open.png">5d74f87d9094023a958641957469a45a</md5file>
-<md5file name="lock.png">432ce2e547c5e3f33850a064c373ffec</md5file>
-<md5file name="close.png">829b1540f684e2828f877e3e4d551734</md5file>
-</dir>
-<dir name="/includes/ckeditor/skins/moono/images" >
-<md5file name="lock-open.png">1559f68beb136775818d5ea6002cb2fa</md5file>
-<md5file name="lock.png">5eeefef845922b742f3c8948728d93d2</md5file>
-<md5file name="close.png">53f705a8191c09c9a14ba304d1ab46ac</md5file>
-</dir>
-<dir name="/includes/ckeditor/skins/moono" >
-<md5file name="editor_gecko.css">9a756c5551ae9339d6e1d852c17174be</md5file>
-<md5file name="editor_ie.css">ad61a40e5452254cc2c0984b68f3100c</md5file>
-<md5file name="icons_hidpi.png">16af6f6d04e4cd2180690cfcab4a7f9d</md5file>
-<md5file name="editor_ie7.css">f0c7e782bd7bba13c9662714c7b8b08f</md5file>
-<md5file name="skin.js">538514e549d114f3d68b1d54200857a2</md5file>
-<md5file name="editor.css">5c8369ba5b6db0212bd4430bf2dfcfd7</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/clipboard/dialogs" >
-<md5file name="paste.js">449b52d23d51c23ed29877609090963b</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/tabletools/dialogs" >
-<md5file name="tableCell.js">1761c41741b70f05925340d5506387e9</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/showblocks/images" >
-<md5file name="block_h5.png">4f196e19ed8ad0fdd14cb73c93fee1ab</md5file>
-<md5file name="block_pre.png">2f0f661518f1dbda9eedda2b6bee734e</md5file>
-<md5file name="block_h2.png">060e9e0bb5a4e5dc1fe0d2fb20b2c801</md5file>
-<md5file name="block_h6.png">dde71309b78bdb3b366654446adea123</md5file>
-<md5file name="block_h4.png">6c65bfeac7e5b5b28af498f2d757f3f0</md5file>
-<md5file name="block_h1.png">2c56066f59944c0167a8e4321f193913</md5file>
-<md5file name="block_address.png">5a24be2dbcae65e78db23bf732ae39fd</md5file>
-<md5file name="block_p.png">b4f2152a14d790847565aa176161acab</md5file>
-<md5file name="block_blockquote.png">198d39094c81152155f8f35108845bbe</md5file>
-<md5file name="block_div.png">05e8b4037cfbb469f9ddc37e8fc9e970</md5file>
-<md5file name="block_h3.png">5468e59e8840a0a6799d6db5d36733dc</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/about/dialogs" >
-<md5file name="about.js">778f8940843f53dc769d8058c68ab83f</md5file>
-<md5file name="logo_ckeditor.png">70dd831c761a20467a6ba9e5ae736f91</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/about/dialogs/hidpi" >
-<md5file name="logo_ckeditor.png">6318d2b6f7fc79b4ed0404ffbc2dac1e</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/scayt/dialogs" >
-<md5file name="options.js">66be5c2031ea52e84d32950433ab9e1e</md5file>
-<md5file name="toolbar.css">80cf4a974ffe1a69b6d6b85abb391d6f</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/pagebreak/images" >
-<md5file name="pagebreak.gif">59caae8ab95b2eeba9444ba219446c75</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/find/dialogs" >
-<md5file name="find.js">af5ab9d4a4d612302de8ec9585c2490a</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/specialchar/dialogs" >
-<md5file name="specialchar.js">c1f4b71c61e227690c2a91f5e22ee912</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/specialchar/dialogs/lang" >
-<md5file name="lv.js">028b01567cdbe95028d6badc35611592</md5file>
-<md5file name="cs.js">6602994ed72d4352ecbb2c9850146b09</md5file>
-<md5file name="bg.js">a3db8a782df812506b9d6cad27f8e954</md5file>
-<md5file name="zh-cn.js">473ca9e5542894f994dede38e28066b0</md5file>
-<md5file name="km.js">d89a7e86895762a2607e598caedc34db</md5file>
-<md5file name="sk.js">3e013fd6dc388618a30da7a3f1b5a8ed</md5file>
-<md5file name="vi.js">dae7a05de8492aabf5292e1627843166</md5file>
-<md5file name="tr.js">fc565819ba9a958ea560b84032c25423</md5file>
-<md5file name="sl.js">0034ffb7a27471f3eb757631582f87b8</md5file>
-<md5file name="es.js">2b84890e6b3235715348b30628a7d988</md5file>
-<md5file name="si.js">0ffe86a454e9a2e570b96610e0a3555f</md5file>
-<md5file name="fi.js">cd35055300e57f0671b50fc9c387efd8</md5file>
-<md5file name="en-gb.js">7535a09b90cebdabf4dfb79035e945c2</md5file>
-<md5file name="ug.js">7e6e4fe81e0ec0764125e763e637c8dc</md5file>
-<md5file name="fr-ca.js">0a9ebc5aee36ab0a70d52a64cbc6a8d0</md5file>
-<md5file name="ar.js">b745e148ae7a29be55d3b468c02358d5</md5file>
-<md5file name="en.js">1f0a736e423e47f3d8227b20a1af8a86</md5file>
-<md5file name="fr.js">a2edf8c5e77fa7790cedb28ea673adfe</md5file>
-<md5file name="zh.js">d5dff411425653893b2da14d14eec340</md5file>
-<md5file name="fa.js">a22482d39c2459c642da4302f3a8e1b0</md5file>
-<md5file name="ca.js">014d8d796b91bbcd60b3eedbc75863c6</md5file>
-<md5file name="pt.js">e12203a069336f9295ba7dc2799db8e0</md5file>
-<md5file name="el.js">a34665a76b93875acb85a2aa370f3607</md5file>
-<md5file name="et.js">920f3546842878108f3e2b6ee8ce5257</md5file>
-<md5file name="nl.js">b96a4e2d85b9f8c0b9eedc62d7c4eebe</md5file>
-<md5file name="gl.js">7786d1011b89d457e8e6b93e84cd82cc</md5file>
-<md5file name="he.js">ff5ee012df7e6eb1b184496b487b502a</md5file>
-<md5file name="eo.js">8e807cf3b227b692047cefa6853a6d94</md5file>
-<md5file name="no.js">3dae2c76a373126a1e0f557be13388e7</md5file>
-<md5file name="uk.js">819fa45bca5f27217ba7548bd5a7f845</md5file>
-<md5file name="hr.js">cac02cb00571d77e1e4c5b43d255304d</md5file>
-<md5file name="pt-br.js">0865eb4eba2e849d7a0695907ab9cef9</md5file>
-<md5file name="de.js">6e549c4c7afb8a58163c09b4cb05b9a1</md5file>
-<md5file name="sq.js">763755c2a64da8d115345fe9efdc29e3</md5file>
-<md5file name="it.js">c91d55c71290f701def881a2ac4c187f</md5file>
-<md5file name="th.js">b46ae112d32a7bf573e91e1a5317b1ae</md5file>
-<md5file name="id.js">7a9603c07c7c3e954696f19521a15d73</md5file>
-<md5file name="nb.js">214546da09bc6e0308a2ad20b6b3044f</md5file>
-<md5file name="ja.js">0ba05d36d4770ee2b157a429247fdadb</md5file>
-<md5file name="pl.js">5f826dc572e1c8dcd3c558d780ec0063</md5file>
-<md5file name="ku.js">c034d80005cbbe505d978c18200358d5</md5file>
-<md5file name="cy.js">daaf526c37518f8f8ab2f3e94ad484ea</md5file>
-<md5file name="hu.js">4f2197b4ce860bf58a77fa2b3d13cac3</md5file>
-<md5file name="sv.js">7df68de6ef4b2321ad1fbd2b99a17a40</md5file>
-<md5file name="ru.js">4351922fd2f520fda06d12a2b2289b3b</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/magicline/images/hidpi" >
-<md5file name="icon.png">befacdcc4c5bf6a333b8c82fbebe282c</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/magicline/images" >
-<md5file name="icon.png">278509efbcd2e9f657549d42026b8bf5</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/image/dialogs" >
-<md5file name="image.js">96e717a4a3dc49d675258c5f28825006</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/image/images" >
-<md5file name="noimage.png">77404b5590596de508a542979f3cda84</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/a11yhelp/dialogs/lang" >
-<md5file name="lv.js">a35562e7cdd0b804bd17ada24f7ce67a</md5file>
-<md5file name="cs.js">7acea37f626cfe23c2ffaaa2238b9199</md5file>
-<md5file name="bg.js">f6cf516b7a668b636bce3c5d02f4761b</md5file>
-<md5file name="zh-cn.js">3b0a4f3b0163c594c2edf81e74c5376b</md5file>
-<md5file name="km.js">a2429a31fdd47c1041ce0251c2134293</md5file>
-<md5file name="sk.js">d0e3fb63def4c4ab3adb6106526084ee</md5file>
-<md5file name="vi.js">0db27eb29d36875409041464d20c7ebb</md5file>
-<md5file name="tr.js">d2a8d93b1fce8d3f7d94c48f5b09a8b1</md5file>
-<md5file name="sl.js">5b06bd221c347124078cb9f718c9833b</md5file>
-<md5file name="es.js">9c3dee5474541512a47b8f597fe8ced5</md5file>
-<md5file name="si.js">c0f621725c1a854f5883923c10774c78</md5file>
-<md5file name="fi.js">83bcea63258aa7e2ba9b84c363e1dcab</md5file>
-<md5file name="en-gb.js">96a11168844b45dd2fca97f0bc837143</md5file>
-<md5file name="ug.js">38022cf76ca5323acb76f40157455a33</md5file>
-<md5file name="fr-ca.js">f1c004946d7ce517f2404c1503ee9743</md5file>
-<md5file name="ar.js">90266c6f598dbc6cf93a656778f8b187</md5file>
-<md5file name="en.js">19179da170c46f684b02f761b92d1105</md5file>
-<md5file name="sr-latn.js">20706e57cf4f66b384e1c97f4d979ec8</md5file>
-<md5file name="fr.js">ddd8c57cac45d04eccbaa0fcf34bb16c</md5file>
-<md5file name="zh.js">32b424542cabc58cd1b48d03faedd6f0</md5file>
-<md5file name="fa.js">9ad8c1b6a3a1090ef1e9ca2cc4011dc0</md5file>
-<md5file name="ca.js">927571178a7bc2392ddf51ed9c7671fc</md5file>
-<md5file name="pt.js">d3302c5817c5e14efadaf79f8e60289d</md5file>
-<md5file name="el.js">7249a77c5170e115f8cf2708e549183d</md5file>
-<md5file name="et.js">3fd47d203a4b3cc1b81dfee881147e25</md5file>
-<md5file name="nl.js">80559b296b0e6a9d5bf8c874f87926d7</md5file>
-<md5file name="gl.js">b58fca4a93a1198c875274945f654449</md5file>
-<md5file name="he.js">d9fc51a5f9cbee44a00ac11d054be3d3</md5file>
-<md5file name="ro.js">d8f1f839d819e5a5422e19c9d846a26f</md5file>
-<md5file name="sr.js">4776bad83eddbd7ca0b0bf9ab1268a4a</md5file>
-<md5file name="gu.js">73b48a65098d2479d6d17599d2325eb1</md5file>
-<md5file name="eo.js">d223d3a210dae0c8c4450d2d767bc0f8</md5file>
-<md5file name="hi.js">80d1206a9520fc1d5c0514bb5a5f96fe</md5file>
-<md5file name="no.js">82b2d5fec7e2ddff86d3c5317793ce5d</md5file>
-<md5file name="uk.js">311ae2c1c1e88e46f811fbdb1aa0959a</md5file>
-<md5file name="hr.js">7aff809832eb6487d3c2032d3e42ca84</md5file>
-<md5file name="pt-br.js">c779d67662315aae394469c636e9a503</md5file>
-<md5file name="de.js">191fcb39e7ebd469b742960329e960f2</md5file>
-<md5file name="mn.js">4504e1996db85389682d7494173f52b4</md5file>
-<md5file name="sq.js">c5893d068b103ca774c452f53231f2d1</md5file>
-<md5file name="ko.js">6657d900bfc5bc7e17b7d3e59f0bf5f0</md5file>
-<md5file name="it.js">1628c9d5dd6258b71e6b29f1828ec052</md5file>
-<md5file name="th.js">ea8f05f3e2dc69ff98dc16cd23b3a88e</md5file>
-<md5file name="id.js">fe101b83892261f6d154031e760dc8b0</md5file>
-<md5file name="nb.js">1dbd2d84c6c8de8fbb57cd9bdc36c6a7</md5file>
-<md5file name="ja.js">f62d66d8f69ade8f9ce8813ef1478415</md5file>
-<md5file name="pl.js">4b458e4a1c672b1b46f0527067f5591b</md5file>
-<md5file name="ku.js">8d7e4124317ef382bf6d0a287be4c46b</md5file>
-<md5file name="cy.js">973f3cbbd4b28320f06640b6f6863f6f</md5file>
-<md5file name="hu.js">830de31b0ab7362c161f3bb33321dbd0</md5file>
-<md5file name="da.js">b76dfbee5e2d20e8f8dfe1acca2eb3ef</md5file>
-<md5file name="mk.js">953b41e51544b16e28af08c8036ec664</md5file>
-<md5file name="sv.js">7f73d5e04aab56c6a59cb8ca9b49b3dd</md5file>
-<md5file name="lt.js">fe4e06252d5ce74ffc29c7f7f5478e77</md5file>
-<md5file name="ru.js">9e11c7384ac4b7e6123e18c918719a2d</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/a11yhelp/dialogs" >
-<md5file name="a11yhelp.js">fe6176c431b43e26a961ab3920734dbf</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/table/dialogs" >
-<md5file name="table.js">af95de23736bb1eafad749b899ac4d40</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/iframe/dialogs" >
-<md5file name="iframe.js">2da765d2b1a8e8992a48a676b956db7c</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/iframe/images" >
-<md5file name="placeholder.png">952e216a7803312fa67ee61c06f3c532</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/pastefromword/filter" >
-<md5file name="default.js">a39f2e668c624cb0b7298c633486caec</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/smiley/dialogs" >
-<md5file name="smiley.js">17093167095a9ea2f4d7015fcf1c039b</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/smiley/images" >
-<md5file name="thumbs_down.png">4ab54cbceb647be525aab443e86249a2</md5file>
-<md5file name="tongue_smile.gif">6d10783b288fe54b3e50f828992d0745</md5file>
-<md5file name="shades_smile.png">1415a98b14e5cb9afe748c674bae25af</md5file>
-<md5file name="regular_smile.png">030c9387085c667ce9014f8f17dc0908</md5file>
-<md5file name="omg_smile.gif">a19b5c291ea2495e2432a27a54353606</md5file>
-<md5file name="whatchutalkingabout_smile.gif">25b67ef8c30f1bd5520742c943025538</md5file>
-<md5file name="regular_smile.gif">1805943c3c41a0aece435f873cb86703</md5file>
-<md5file name="envelope.png">95cffdc2b1e72e9b8baae9e00aff08ec</md5file>
-<md5file name="heart.png">e38d30e0053468a2789af17d38f9c444</md5file>
-<md5file name="thumbs_down.gif">457178c3e1e5a10eeab9f0f920df8926</md5file>
-<md5file name="heart.gif">93e6fff7bffc55153d9c2859ac28e48b</md5file>
-<md5file name="devil_smile.png">ae7676fbfbf82586f79479b56756cce1</md5file>
-<md5file name="thumbs_up.png">11510868ce8e8ed585a6ad563ee22a9d</md5file>
-<md5file name="shades_smile.gif">0813f938cc098ddc751cbef6bdecf7cd</md5file>
-<md5file name="lightbulb.gif">3d403bb930953d625b0a771484cc85e9</md5file>
-<md5file name="cry_smile.png">e24a05f22bf8f9d91fb17899c3ac56fd</md5file>
-<md5file name="angel_smile.png">94ac3c915312d3e4445343bc99be0c54</md5file>
-<md5file name="thumbs_up.gif">0c7f9b9d0824505bd03fa82b4cc753a3</md5file>
-<md5file name="sad_smile.png">a23c0a40efc09de6a7640b5d0d9f4bb7</md5file>
-<md5file name="cry_smile.gif">14eaed2d73022fca3bebfae0052b0c6b</md5file>
-<md5file name="angel_smile.gif">c4b9c95d9f742081196beb6e72ded20f</md5file>
-<md5file name="kiss.gif">a1fef4cefd9e43603349f8e4d9775029</md5file>
-<md5file name="tongue_smile.png">f3f0b68b3af528ca89254103743c048e</md5file>
-<md5file name="embaressed_smile.gif">166b5085bfb3eaa3d73326a8829a34b3</md5file>
-<md5file name="envelope.gif">640883a64b98eca9219958f0c9a3c777</md5file>
-<md5file name="teeth_smile.png">1b3f37880568ec36e07297ddc71e2baa</md5file>
-<md5file name="omg_smile.png">9683369b3890d4830e9e0ba0e65743f3</md5file>
-<md5file name="lightbulb.png">5da336a24e940842244ba5365f8f391a</md5file>
-<md5file name="teeth_smile.gif">fbcb93b073c2737f2238a68e0e8d173f</md5file>
-<md5file name="broken_heart.png">bd17ba6ddc0c45fa6b7b7dd3704a88d7</md5file>
-<md5file name="wink_smile.png">a8642b488c4247b15aa815bd0fb20c3b</md5file>
-<md5file name="kiss.png">a0bc93f53f35404900f567504449f73f</md5file>
-<md5file name="wink_smile.gif">b1f0a29724f70701011af095dccf9da6</md5file>
-<md5file name="confused_smile.png">68b71eb39de968b214aee59c7aee63f2</md5file>
-<md5file name="embarrassed_smile.png">746058795a92d2278489bdac1c9eb850</md5file>
-<md5file name="broken_heart.gif">82f4dcbc8b788985f547dccef636c95e</md5file>
-<md5file name="angry_smile.gif">10c1c4d475f9050f55a4f30d321f68c8</md5file>
-<md5file name="sad_smile.gif">3bfda8ed81210d7473e60dfd1c5fb2b9</md5file>
-<md5file name="whatchutalkingabout_smile.png">a6472d528369b797a46bfb37d6ed972c</md5file>
-<md5file name="tounge_smile.gif">6d10783b288fe54b3e50f828992d0745</md5file>
-<md5file name="embarrassed_smile.gif">166b5085bfb3eaa3d73326a8829a34b3</md5file>
-<md5file name="angry_smile.png">58d03455e940b51010a2a56a8cb04ef8</md5file>
-<md5file name="devil_smile.gif">e9421d09d8e14616be9571c92125933c</md5file>
-<md5file name="confused_smile.gif">71a6cf09e9f6d0f95ada2ec5d99b3865</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/colordialog/dialogs" >
-<md5file name="colordialog.js">8ed32273f32368492ee999ecd0aabe32</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/fakeobjects/images" >
-<md5file name="spacer.gif">df3e567d6f16d040326c7a0ea29a4f41</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins" >
-<md5file name="icons.png">bfa0bba21e124aa73b63eae9b9a6c47f</md5file>
-<md5file name="icons_hidpi.png">16af6f6d04e4cd2180690cfcab4a7f9d</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/dialog" >
-<md5file name="dialogDefinition.js">6105439c866957299f095b3d7846bc23</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/link/dialogs" >
-<md5file name="link.js">271a12927f090ebc5287e8b0b5e9d9e6</md5file>
-<md5file name="anchor.js">fa289af1974267e9531614663efea272</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/link/images" >
-<md5file name="anchor.png">b61cb3c36c0363df2b0ebf91a8b814a0</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/link/images/hidpi" >
-<md5file name="anchor.png">5ff2733687ed023674151563277f9606</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/forms/dialogs" >
-<md5file name="hiddenfield.js">2cdcde2cc55e76e3bbf24d02cf0d5edb</md5file>
-<md5file name="form.js">800020de3c5e41aa2e1887c2fca17095</md5file>
-<md5file name="button.js">b2b5a3ec23189f079c587821b665d271</md5file>
-<md5file name="checkbox.js">87d3ebf2feaa2b176b4eebbac3c088c4</md5file>
-<md5file name="select.js">3627aa8209fbb1c672443bc6bdce8923</md5file>
-<md5file name="textarea.js">4869bcd4fb1502311f94519cda884950</md5file>
-<md5file name="radio.js">b7a2f3050293050b58a79bca2cd9833e</md5file>
-<md5file name="textfield.js">7674233880679083e8ff7a23695679d4</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/forms/images" >
-<md5file name="hiddenfield.gif">c724101436b085bf318e695fd784d658</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/div/dialogs" >
-<md5file name="div.js">5fa3923b76e77bd28b072bf20bb0acf2</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/wsc/dialogs" >
-<md5file name="ciframe.html">ce2c91ad6dfd86639dbd6fad1fbef509</md5file>
-<md5file name="wsc_ie.js">31f3882cc425568f4276987a0aba2b0d</md5file>
-<md5file name="wsc.css">272ead8eec497be617cc3d390c427477</md5file>
-<md5file name="tmpFrameset.html">fd9e4859f8b774b936461669096cdf31</md5file>
-<md5file name="wsc.js">b340ddf06546f0c481260cf31af607f0</md5file>
-<md5file name="tmp.html">2cab0bd74fdd7b997aba318b7c90eed5</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/liststyle/dialogs" >
-<md5file name="liststyle.js">4fd58f34401bd65ac6e428a695289076</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/templates/dialogs" >
-<md5file name="templates.js">02087b98d2508beeff533581d41c148d</md5file>
-<md5file name="templates.css">502ec066ce17658bc228175aa6d2bb51</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/templates/templates/images" >
-<md5file name="template2.gif">8a4d45166ebeef73e222270a8113d66f</md5file>
-<md5file name="template1.gif">fc667c4366fe133c30ab122fe2ee7f20</md5file>
-<md5file name="template3.gif">b8650f06582ac88ece68948bac1bf734</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/templates/templates" >
-<md5file name="default.js">ea413228af8c99c7afe67a10acb0ae39</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/flash/dialogs" >
-<md5file name="flash.js">a6191ed337fb956171397255b5b256e2</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/flash/images" >
-<md5file name="placeholder.png">e9ac9384237d8d1cdaab68d31a22005d</md5file>
-</dir>
-<dir name="/includes/ckeditor/plugins/preview" >
-<md5file name="preview.html">8c10865beddd7b64913db21f12059c64</md5file>
-</dir>
-<dir name="/includes/ckeditor" >
-<md5file name="contents.css">d009e5dbfe5f3a20be203586165c6567</md5file>
-</dir>
-<dir name="/includes/ckeditor/adapters" >
-<md5file name="jquery.js">cb682e94976a833702918c30350cdf92</md5file>
-</dir>
-<dir name="/includes/ckeditor/lang" >
-<md5file name="lv.js">26de1f4efdbea90dc07b2d66d9e98f3e</md5file>
-<md5file name="cs.js">33dfb82a79bfd5cd05b336e1c9d7e972</md5file>
-<md5file name="bg.js">0826365fe3595c15372b8aacbe0a050d</md5file>
-<md5file name="zh-cn.js">a86fe4f29f0b81bba412d2d443538282</md5file>
-<md5file name="km.js">f5774b1f9313dd43fd39a7c1e2c49c98</md5file>
-<md5file name="sk.js">f2fe25865fb26d8a60799cbb700aec31</md5file>
-<md5file name="vi.js">3a16d03720c344ace88ac9f4557e5da6</md5file>
-<md5file name="tr.js">dd52c331a81417dfa817ae740317e839</md5file>
-<md5file name="sl.js">726f61ec81224067b92d3b5c8c66d16d</md5file>
-<md5file name="es.js">89fe2062ff820aa1cfe0d73fcd75b8a0</md5file>
-<md5file name="si.js">83e4d18f829b194bfeda62d7374a7706</md5file>
-<md5file name="ms.js">87f8ce4d8fe767f9ad78c76b54dcbe63</md5file>
-<md5file name="fi.js">7bd02886e8a02672e68d7f9ca82989f0</md5file>
-<md5file name="en-gb.js">c8cb9e2990d4823212d9adbd3904d612</md5file>
-<md5file name="en-ca.js">135c15c8da02cbddabd2830ff17f1f90</md5file>
-<md5file name="af.js">673d347d114623bc685bd6960a975b98</md5file>
-<md5file name="ug.js">b0262a6867fa221fe3d1d1cfcd0c55ca</md5file>
-<md5file name="fo.js">6f906400cf7764ee9b99c5f062284a33</md5file>
-<md5file name="en-au.js">f7a43d21c05827078185dfd3f1898a0f</md5file>
-<md5file name="fr-ca.js">c11a232f8789d4c81cc7b99ed6a5a6b7</md5file>
-<md5file name="bs.js">be80996f8def6c9a756f99e2d6ab063d</md5file>
-<md5file name="ar.js">f687c08e85b9c6d3b98ea103e274285e</md5file>
-<md5file name="en.js">36cf39ebed632539610e00972d066d66</md5file>
-<md5file name="sr-latn.js">c84baa08f37224a274adeff9b38857d8</md5file>
-<md5file name="fr.js">3e77aa1c3743a9e66ad430d565d5bba9</md5file>
-<md5file name="zh.js">d197d53598e59e38d6b53e4493878a37</md5file>
-<md5file name="fa.js">3bf26c69a67bba08b33ab9a1cfa913ab</md5file>
-<md5file name="ca.js">7260e1fef9a19946b0b9997f0835d28c</md5file>
-<md5file name="pt.js">1ad9babe1124b8ce470d94369c466cc6</md5file>
-<md5file name="el.js">34ace00de3d8f572a795b92afd8182e1</md5file>
-<md5file name="et.js">1dd9c8b444e2c6bcde222d7480a789c6</md5file>
-<md5file name="nl.js">3a05dda84962024153be0c897f7fce74</md5file>
-<md5file name="gl.js">b35cabdd2609ed64c6aacfcc62de2d1b</md5file>
-<md5file name="he.js">d96b9150972b45c9d342d631733e2adb</md5file>
-<md5file name="ro.js">d61f773d2fb9d3c45fa3696dbac3c9bd</md5file>
-<md5file name="sr.js">7090962dff4fc5fea54bf747f9762cb4</md5file>
-<md5file name="gu.js">27269177df2db78584bc130e8da427b9</md5file>
-<md5file name="bn.js">ccd660c0e96ac3a5bad8c55c57c171e3</md5file>
-<md5file name="eo.js">a379a744cf64f76e44191fd83ae5660c</md5file>
-<md5file name="hi.js">dcc4141b642e5b91722db9fc5641c3ff</md5file>
-<md5file name="no.js">c404a5cb3e2d0c7dd3560e6db70dc0af</md5file>
-<md5file name="eu.js">e76061a42101f521a01031aef0759b24</md5file>
-<md5file name="uk.js">158e329a2f7aed3469479f8f9ca4017e</md5file>
-<md5file name="hr.js">43d892662422c27d6d6da3ea4a84ea14</md5file>
-<md5file name="pt-br.js">7da25cffe11482c608af3eead69e9a72</md5file>
-<md5file name="de.js">512f8fb3042cca9b5492906df80c8d1c</md5file>
-<md5file name="mn.js">294600d0d52d86683cf6b17fedfc1794</md5file>
-<md5file name="sq.js">97e9ad68e43dd571ee2dd32453b579e5</md5file>
-<md5file name="ko.js">659a267cde3be07c1b3ef6388ca5b034</md5file>
-<md5file name="is.js">f4e01b5d04b992dbdf05a536386e43ae</md5file>
-<md5file name="it.js">9b1fa0f7b10bb71d25926e108bd33a7c</md5file>
-<md5file name="th.js">194a664f4110062a5e5fc61e4c41d380</md5file>
-<md5file name="id.js">99042f7adff906f9933d08a02d6d87f6</md5file>
-<md5file name="nb.js">7302e05f5eba2dc64003cd74e1c3fefa</md5file>
-<md5file name="ja.js">a4e35b5662f37aa780b2b665625e9e3d</md5file>
-<md5file name="pl.js">38062f6727bd12537a6434bc070d633c</md5file>
-<md5file name="ku.js">b77d5b396676b9018dbbb98dfa3540dc</md5file>
-<md5file name="cy.js">764fb4541826961d8b07302fdfa19855</md5file>
-<md5file name="hu.js">31fa16bfc0c36de373ac2aa9eb44147a</md5file>
-<md5file name="ka.js">e817fb4adea53ff6fec6fe9fded710dc</md5file>
-<md5file name="da.js">09fb96e516325be267b5253ed86ddcc8</md5file>
-<md5file name="mk.js">aae28f0dcc80ea5771e96fa2b85384b2</md5file>
-<md5file name="sv.js">dab061d0b54998d4b61de139a368c9dd</md5file>
-<md5file name="lt.js">1596278a679167aeccfa3ad3ce84ef5e</md5file>
-<md5file name="ru.js">49af03a5a811b6c74ef0b1db74b0ce55</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source" >
-<md5file name="build-config.js">33a20a15ff624caf095a70d941844501</md5file>
-<md5file name="ckeditor.js">86414fd484ecf3d234ed74d44a654a12</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor" >
-<md5file name="editor_ie8.css">e66e9eb7cbfabb44ab0ad0907e78bbcb</md5file>
-<md5file name="menu.css">5d71f443ff4a119b970d1446eb9e4331</md5file>
-<md5file name="dialog_ie8.css">9ba3289e9a9cbcb00ad24cf05ee61052</md5file>
-<md5file name="mainui.css">f85c610b97db0d0c6d9a4a080f4fe72b</md5file>
-<md5file name="reset.css">1248dd3c3036921f8dfc9a029acea033</md5file>
-<md5file name="colorpanel.css">f03fa5a7df87681274d6d7bd6d450ced</md5file>
-<md5file name="dialog_opera.css">da32c073db3a1981a3ee939f99b49285</md5file>
-<md5file name="presets.css">fad40b8184678de95bb0ba0b81fec208</md5file>
-<md5file name="editor_iequirks.css">edf0938b11cc3848f8084b68a31355f9</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor/icons" >
-<md5file name="indent.png">56c557bdd702896e8e076c3081e473b2</md5file>
-<md5file name="underline.png">50997d9fb65b02489760c78eae407edc</md5file>
-<md5file name="creatediv.png">3fd7cce0383f0a53942f944e744bfb2b</md5file>
-<md5file name="save.png">c2e66f879f8c7063b30ca7e69f31f1b0</md5file>
-<md5file name="bidirtl.png">c45eaec9eb14a27da49011c02adf3a51</md5file>
-<md5file name="scayt.png">a11dff5fe4e86ecc62be49088ffea855</md5file>
-<md5file name="removeformat.png">4cf6cd7a6e0d99a58e3b1745aeb27199</md5file>
-<md5file name="preview.png">7b32bb71dbde86104e8a2651a0f678fd</md5file>
-<md5file name="justifyblock.png">c9a17a1c85b85d5d306f529c8a3adf46</md5file>
-<md5file name="templates-rtl.png">319963e6815ba4311bf548ca102ee6f5</md5file>
-<md5file name="smiley.png">8f34c8654f8e475af529e3bb7459f54e</md5file>
-<md5file name="textarea.png">c0e04a4fddc99fd59f7597b5596ce974</md5file>
-<md5file name="newpage-rtl.png">86b708daa84d59d331682bee9892e85f</md5file>
-<md5file name="image.png">1241ba263a9be7c581f875fb4d1fa7c5</md5file>
-<md5file name="undo.png">339da1ab31dc9cccbcf13e19787f32cb</md5file>
-<md5file name="outdent.png">0bdc181700120677a20a475a986713c5</md5file>
-<md5file name="paste-rtl.png">7ec2d1bc85219648e666a51798ee852b</md5file>
-<md5file name="justifycenter.png">16845ff77ddf90cc0ecdb71b56af8ee8</md5file>
-<md5file name="maximize.png">69703c2680a20175e0f6ff614ac78058</md5file>
-<md5file name="find.png">5e1923144f861d00820902f847f2eb85</md5file>
-<md5file name="anchor.png">e6db5f2f060d5f9043679494dac018b2</md5file>
-<md5file name="paste.png">c5ca42e5b9a303dd6af35b105346e4af</md5file>
-<md5file name="pastetext-rtl.png">e871685a98946ca4c8b69a788445f1ce</md5file>
-<md5file name="copy-rtl.png">03ab5f4dee17c243959ab547318f253b</md5file>
-<md5file name="iframe.png">884910e45e2af8b06310473028b89efc</md5file>
-<md5file name="bold.png">5b9638d72c2e3da6f9f2f3065f0bb838</md5file>
-<md5file name="form.png">e0b821fb1bd51698f9605a5f10c412ae</md5file>
-<md5file name="justifyright.png">1aa7a4d31b327012f0d82767b1d3c2eb</md5file>
-<md5file name="hiddenfield.png">87414ee7df77d4c9d1fe67d5f1cedb57</md5file>
-<md5file name="anchor-rtl.png">6aab61a89be474d3834ace048aee8215</md5file>
-<md5file name="checkbox.png">c0cf1619503636f2e510a4ad4b5ddfe8</md5file>
-<md5file name="redo.png">e80d05e8f07bc7a9c28bad9218fc3065</md5file>
-<md5file name="selectall.png">aad095174c7048e4a69870115ad6b31c</md5file>
-<md5file name="preview-rtl.png">db3c9c925a27a7b21639195b99f8e4a7</md5file>
-<md5file name="justifyleft.png">7226d89117fc5ac6857b99c8be92bcc8</md5file>
-<md5file name="horizontalrule.png">8a8b1be3faf887f79648add1f27e1b27</md5file>
-<md5file name="source-rtl.png">29a83e90e646d322fc5927f85d4852f4</md5file>
-<md5file name="bulletedlist-rtl.png">db06b5525d74d001f4d5f0cc6b34a12d</md5file>
-<md5file name="subscript.png">7d75e3b46ecc1a8e9127999c2b395343</md5file>
-<md5file name="flash.png">5f346f8ec0669638b98d39313d395af1</md5file>
-<md5file name="select.png">cefe770c34e74c464ecfc1d631e1ca7d</md5file>
-<md5file name="textfield-rtl.png">a7d644a48b076360087a7a79ef16eb15</md5file>
-<md5file name="find-rtl.png">019d661924ad0e08fba33d4640062948</md5file>
-<md5file name="pagebreak-rtl.png">a9e4f979c124b66bcef17fe804848dee</md5file>
-<md5file name="textarea-rtl.png">db7179a1e24cbacb8e38d9aa20649e91</md5file>
-<md5file name="newpage.png">91e614515ba574d4070c122565883a73</md5file>
-<md5file name="bgcolor.png">519bf115c5c9e778efca8d4c102d5047</md5file>
-<md5file name="imagebutton.png">76f78ddf57c04618eeaf91bececf5070</md5file>
-<md5file name="italic.png">b66742d49c03112fdddc0f124674eda9</md5file>
-<md5file name="replace.png">2c93bd8b0859a6063fc46e9936349be4</md5file>
-<md5file name="link.png">89da62f432454d38e9d390c6755045de</md5file>
-<md5file name="redo-rtl.png">339da1ab31dc9cccbcf13e19787f32cb</md5file>
-<md5file name="pastefromword-rtl.png">91f86050486e00b05570c05a19fc19ae</md5file>
-<md5file name="specialchar.png">01255ebdaee025b76aba812ac120a8ac</md5file>
-<md5file name="showblocks-rtl.png">74f64a752fe2e6ae40410c0cc8c6409f</md5file>
-<md5file name="numberedlist-rtl.png">0672e3b38e39e2da6b12396046b2937c</md5file>
-<md5file name="strike.png">0016a818ba0e5e80338f772d496b029e</md5file>
-<md5file name="textcolor.png">cceafae6cc15d9f207d1343abb1ff87a</md5file>
-<md5file name="unlink.png">a34ab3d3db924dd1d886b28355b7175e</md5file>
-<md5file name="about.png">a9534f82f0bdee1b54ec994cd1983701</md5file>
-<md5file name="copy.png">3b4fa04dc11a6e53545ef0477ac5183a</md5file>
-<md5file name="outdent-rtl.png">234f6edca3b318e354044327427104c5</md5file>
-<md5file name="source.png">68b62695aa7282666496e8e717d50d9c</md5file>
-<md5file name="pagebreak.png">75e036f626780dbeb1dad742acf50799</md5file>
-<md5file name="cut-rtl.png">49be3f76782716d636811a5ec6ca04b1</md5file>
-<md5file name="print.png">a71bbb5349e4cf1e586f57a3d561bb69</md5file>
-<md5file name="blockquote.png">d70d0fc33efbe51901ad0d0ea441d086</md5file>
-<md5file name="showblocks.png">1fb4d036eff2822c256cb5fa0d23d220</md5file>
-<md5file name="button.png">91c5d82c8305a0e3e21d16b1eb375660</md5file>
-<md5file name="table.png">a733db7d8ef9106107b0810d2d0bdba9</md5file>
-<md5file name="cut.png">b62825ff9f9334fd7f805a5a4fe8d5cb</md5file>
-<md5file name="textfield.png">22643a84c533ce44120c10fb36eab40e</md5file>
-<md5file name="select-rtl.png">5b94dbe7748b69a93e0773d961faf144</md5file>
-<md5file name="superscript.png">212ec409cb0cf752f27376cc5cafaf9f</md5file>
-<md5file name="numberedlist.png">10335c5cbc53b01da174fb889eb182f7</md5file>
-<md5file name="pastetext.png">4fc646f85aedd3f6f2875a164839e864</md5file>
-<md5file name="bidiltr.png">6cd7b0f700ef9c8a4f198075bad202cd</md5file>
-<md5file name="pastefromword.png">74ed6ef670b00441f37e64c157720ff8</md5file>
-<md5file name="indent-rtl.png">1666e8c4705830acd13ee691a4741d55</md5file>
-<md5file name="templates.png">1f30aa3f9407a10e4f703b1af6b16f85</md5file>
-<md5file name="radio.png">db621a89d6126c8926c2674d68701e4c</md5file>
-<md5file name="undo-rtl.png">e80d05e8f07bc7a9c28bad9218fc3065</md5file>
-<md5file name="bulletedlist.png">248aa4981a7cde501e58f84acb3877cc</md5file>
-<md5file name="spellchecker.png">a11dff5fe4e86ecc62be49088ffea855</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor" >
-<md5file name="dialog_iequirks.css">d0027d668c71a7ad863ee8acce1f91b7</md5file>
-<md5file name="toolbar.css">d6045b65dbb2ba38a4f113f9aacde587</md5file>
-<md5file name="dialog_ie7.css">5358770d6c46d49d3e8bd54f426e6699</md5file>
-<md5file name="dialog_ie.css">3b0b4802fad7a92aeba2b1e308afed38</md5file>
-<md5file name="dialog.css">feb97272d66c597cd9edac65acdaaba4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor/images" >
-<md5file name="arrow.png">1736b2041754ba66b0f078d8e1abaff2</md5file>
-<md5file name="refresh.png">669da5a688185e4b472e7c0d8166d149</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor/images/hidpi" >
-<md5file name="refresh.png">b2b0dd629761bfc7fd5b8d2d3ed167f7</md5file>
-<md5file name="lock-open.png">5d74f87d9094023a958641957469a45a</md5file>
-<md5file name="lock.png">432ce2e547c5e3f33850a064c373ffec</md5file>
-<md5file name="close.png">829b1540f684e2828f877e3e4d551734</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor/images" >
-<md5file name="lock-open.png">1559f68beb136775818d5ea6002cb2fa</md5file>
-<md5file name="lock.png">5eeefef845922b742f3c8948728d93d2</md5file>
-<md5file name="close.png">53f705a8191c09c9a14ba304d1ab46ac</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/skins/moonocolor" >
-<md5file name="editor_gecko.css">9db06a7d00754a56a880b0b2840c7206</md5file>
-<md5file name="editor_ie.css">9307f277c8eca3d6aadb747e0488590f</md5file>
-<md5file name="editor_ie7.css">877fc4512a836590d97afd52a061a8b9</md5file>
-<md5file name="skin.js">0bfbf3d7aca8183b21df3d3e89a5fe8e</md5file>
-<md5file name="elementspath.css">e55c1d03dec8ed13c5d3dc07b475a6f6</md5file>
-<md5file name="richcombo.css">03aa90b73362c9ea7992ddebe0c05a76</md5file>
-<md5file name="editor.css">8bbcfb26c88be66b335615ace22a13b8</md5file>
-<md5file name="panel.css">181cd7e0c4e3aee620bb6b1419143c4a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/listblock" >
-<md5file name="plugin.js">74b6ecca3710147d87712eafb36462c3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colorbutton/icons/hidpi" >
-<md5file name="bgcolor.png">7f4d91d401913000068e27694421094c</md5file>
-<md5file name="textcolor.png">8e3cffa1da8be98668c562421fc859f4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colorbutton/icons" >
-<md5file name="bgcolor.png">406082d01ab1415f333b23bceecb9e2c</md5file>
-<md5file name="textcolor.png">6cd8f5c9f1717ee73ceba5683d9a8a8e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colorbutton/lang" >
-<md5file name="lv.js">a99cbc0f37a87adc024e1b73c90f020b</md5file>
-<md5file name="cs.js">f7d3b25b8383affe405ccc7d5520a037</md5file>
-<md5file name="bg.js">697a2829a99eb956dbd10748c117cc78</md5file>
-<md5file name="zh-cn.js">00f978d26f57a925cbb25655a8611582</md5file>
-<md5file name="km.js">a5dbc5478b058344cab126fe37e81205</md5file>
-<md5file name="sk.js">ae24380f9d45f4b7bac2050ce8dfb3c8</md5file>
-<md5file name="vi.js">ae79a19f64be5aea70c115f8255dd835</md5file>
-<md5file name="tr.js">441cdfd7ba1feb089bc3a423d068f9e0</md5file>
-<md5file name="sl.js">baf082b9e90e7e4d6812bbf0373cc607</md5file>
-<md5file name="es.js">e2cf998acb9c8017f3ceeff4f583593e</md5file>
-<md5file name="si.js">a46fcde339e4260686e19c1074ea006a</md5file>
-<md5file name="ms.js">9fe7f36dd10f438653ed48ca9373137a</md5file>
-<md5file name="fi.js">d3134c6c9a847c3459c89ac6a7e29ad3</md5file>
-<md5file name="en-gb.js">3dadee4718b9777aef137e589260ef71</md5file>
-<md5file name="en-ca.js">9e574aa8ef5742657d4761ea590bcc02</md5file>
-<md5file name="af.js">b3b6cc0f994d14e8a62103c8bfc21882</md5file>
-<md5file name="ug.js">df20aeaa69ef080a06060eba30d1e658</md5file>
-<md5file name="fo.js">58c4b49556ec3db5e02b1cbccc70b5b3</md5file>
-<md5file name="en-au.js">e2983c0de2b9fb5cd06f1b5811e7adc5</md5file>
-<md5file name="fr-ca.js">6363f698668a40602f462850d4c25f12</md5file>
-<md5file name="bs.js">e3b9a6128f379e070c4b5899707a0602</md5file>
-<md5file name="ar.js">9baadd2aa9e1de012fddc697c09cad3f</md5file>
-<md5file name="en.js">57d4381904bcc9a1447b416b782637e0</md5file>
-<md5file name="sr-latn.js">98ae0c9ccdbeb50ba601b98bf67cf6d8</md5file>
-<md5file name="fr.js">e304041ed01654e365947acc9fb1d14c</md5file>
-<md5file name="zh.js">b928bdce0d72bed17fe44576c42982e4</md5file>
-<md5file name="fa.js">46a3b08d3faf5bb3625bc38218d47d3e</md5file>
-<md5file name="ca.js">cc19e43dd168d6be5e21701a6ed7e32a</md5file>
-<md5file name="pt.js">3a5f3bf957587a46b9a704956ff1481a</md5file>
-<md5file name="el.js">deef6c173ca516df1dc003198865ef82</md5file>
-<md5file name="et.js">213a4fcd11e4b256bea106c5b270ceb8</md5file>
-<md5file name="nl.js">fd3527c05093fddefcbf6211d2894c2c</md5file>
-<md5file name="gl.js">193d4af6e0e6712b7a209fd67e93abf3</md5file>
-<md5file name="he.js">7603a607972637b1c0ff71e2596527ca</md5file>
-<md5file name="ro.js">9f4c93b61a1c68dd9bd30039a29add31</md5file>
-<md5file name="sr.js">82b7ec40dda186fb73fe7cd1ac4fc1db</md5file>
-<md5file name="gu.js">d1204c1552417abbd0552a30f9518329</md5file>
-<md5file name="bn.js">3a004ec9782fe8641061c737bcc4c5b4</md5file>
-<md5file name="eo.js">11116f8d3cf5c4ef1be973f9e6abd134</md5file>
-<md5file name="hi.js">3251760626952fcae88770155112e9a5</md5file>
-<md5file name="no.js">9edbcb7c5c4a7302017327b91b101a0d</md5file>
-<md5file name="eu.js">85145018ad16e0ab05c8f50f61e0794e</md5file>
-<md5file name="uk.js">0539ca2a10f92b1f7e2d2ae8d8c8033c</md5file>
-<md5file name="hr.js">90a818a12527d815dde625cc0cde03d8</md5file>
-<md5file name="pt-br.js">28daa476010b8e6e78cbaaa8568a6611</md5file>
-<md5file name="de.js">4271b68296af1b267b960df4e1794fe3</md5file>
-<md5file name="mn.js">69ce2bbcad4a3ebab718ee1dd8d712d3</md5file>
-<md5file name="sq.js">4d167ba23f487bb71f7c8d2cbec38864</md5file>
-<md5file name="ko.js">1b1c432b9dae46e45d8bb8f59a93b0fa</md5file>
-<md5file name="is.js">ea27fc1a059305edd6a37bdde556eceb</md5file>
-<md5file name="it.js">2ca3a315405f31ee3b8964a3a46989c4</md5file>
-<md5file name="th.js">d10483f203f2d03ca7c2d05b87ae7bbb</md5file>
-<md5file name="id.js">8439670b64da2645d451a6b7fa17a75f</md5file>
-<md5file name="nb.js">390d090c861a2fb31df9cc8b61ccd3b8</md5file>
-<md5file name="ja.js">7833b5dbb1acb30e57e3c6b041b21f2c</md5file>
-<md5file name="pl.js">eb2bd9a3a7ac1a61a4f6bcdf81ec67b3</md5file>
-<md5file name="ku.js">dc4cd9fc4b1168633b3795cc782a5321</md5file>
-<md5file name="cy.js">d60b5ff021116b6d23a72201fd71fae6</md5file>
-<md5file name="hu.js">f804896363c3c3fa6efe77015da7f7b5</md5file>
-<md5file name="ka.js">8ba7cf9afe2511eab38617b27953a20b</md5file>
-<md5file name="da.js">e43a69585d1b9a065c06fdc43bf05e9b</md5file>
-<md5file name="mk.js">0b600c49e6886b114468455404dfedab</md5file>
-<md5file name="sv.js">f679ac711c84e892be1c2e6360661ea3</md5file>
-<md5file name="lt.js">6159fdae83bd1af5e503ced6c485d7f9</md5file>
-<md5file name="ru.js">5b50d480029b579c532f51bf70375b3d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colorbutton" >
-<md5file name="plugin.js">69093bdaa5daeae6c38aaff4fd56889a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indentblock" >
-<md5file name="plugin.js">2b250cf01dc18e37e2193a957ea8d4f3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/resize" >
-<md5file name="plugin.js">00f9e6921782590db265fabe0385a000</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/richcombo" >
-<md5file name="plugin.js">5c2000762f2496f6dea7c85d5e76394b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showborders" >
-<md5file name="plugin.js">2e0fc091488364fa5dce78e28935f772</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/icons" >
-<md5file name="paste-rtl.png">d033e4f6d584e6c005ab98b75cfdc791</md5file>
-<md5file name="paste.png">d033e4f6d584e6c005ab98b75cfdc791</md5file>
-<md5file name="copy-rtl.png">016f786cfe21feb1af8ef4139fff7b90</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/icons/hidpi" >
-<md5file name="paste-rtl.png">ba0b6ffcbfe503f0b4af39f6d292042b</md5file>
-<md5file name="paste.png">ba0b6ffcbfe503f0b4af39f6d292042b</md5file>
-<md5file name="copy-rtl.png">03654d950ab0ad4ad32a5586f3ab7617</md5file>
-<md5file name="copy.png">03654d950ab0ad4ad32a5586f3ab7617</md5file>
-<md5file name="cut-rtl.png">f832060d1857f1e4faf65d15d687ab43</md5file>
-<md5file name="cut.png">f832060d1857f1e4faf65d15d687ab43</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/icons" >
-<md5file name="copy.png">016f786cfe21feb1af8ef4139fff7b90</md5file>
-<md5file name="cut-rtl.png">a73b8885237ec16124ec960c5ec5af11</md5file>
-<md5file name="cut.png">a73b8885237ec16124ec960c5ec5af11</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/lang" >
-<md5file name="lv.js">e105f20bcf593d08b574d666a4659fdc</md5file>
-<md5file name="cs.js">b288b09cbe915f05d94f37b402547e1e</md5file>
-<md5file name="bg.js">a91c20099677f7cdeada8fd1a0fe90f5</md5file>
-<md5file name="zh-cn.js">d6293a67d76f33b7fd8a479847589517</md5file>
-<md5file name="km.js">4d90073c0ff78733556c5d39b861581c</md5file>
-<md5file name="sk.js">59a0fd9ecd7de0b42d8295fa58e0c2bf</md5file>
-<md5file name="vi.js">91ab25c960808374d8c43cde798d271b</md5file>
-<md5file name="tr.js">b49063e50418e2d19b5566e588e661e8</md5file>
-<md5file name="sl.js">f4b4691d1e7a01e3b662bea34e79bee2</md5file>
-<md5file name="es.js">9c4b83283c96a6ae1f63a556933c9d98</md5file>
-<md5file name="si.js">5737b4aa9ebec80710fd46a3920822b5</md5file>
-<md5file name="ms.js">329247bb2a92a2fcaba89e7ec980eaaf</md5file>
-<md5file name="fi.js">1f07177e6539cb5747d29ae51b867669</md5file>
-<md5file name="en-gb.js">944f5bfde4920dc5075164b83475e264</md5file>
-<md5file name="en-ca.js">9187a95d9a20180f3f520d6a4dc17107</md5file>
-<md5file name="af.js">f57ea9c530cebc193afab16022342a49</md5file>
-<md5file name="ug.js">810f1f8ff19faaeffff0c4738db008f2</md5file>
-<md5file name="fo.js">bfe22db4f51e8a452666d894c43b78c7</md5file>
-<md5file name="en-au.js">96f101af9311167f4ecabf15f2215b34</md5file>
-<md5file name="fr-ca.js">8a781f7bb83695ba35c4db1a77a575d8</md5file>
-<md5file name="bs.js">00c41ccb3dbf4b9f5320aa0b07ca6c03</md5file>
-<md5file name="ar.js">67a2b6cac6b5c64a2cfd977d2262a736</md5file>
-<md5file name="en.js">f03f9ba07ede1347f117cd6c47de68b5</md5file>
-<md5file name="sr-latn.js">c897a6579efde9449f38572c02968ea2</md5file>
-<md5file name="fr.js">7ecf64cf4c33beb7f731a2acd0ac509f</md5file>
-<md5file name="zh.js">9bccc0d5f26adc27cd1d2ad25da2b340</md5file>
-<md5file name="fa.js">5a78236713f3d2c88291eb069ec7b0cc</md5file>
-<md5file name="ca.js">b744a252a876b7ff3cf19d8fee208f9e</md5file>
-<md5file name="pt.js">6992f9b3ce6856117513bc470b021e23</md5file>
-<md5file name="el.js">56a003fe558d2e69229d2dd6ab5db6cc</md5file>
-<md5file name="et.js">c7ed58416f23cb2060943c032f5fd713</md5file>
-<md5file name="nl.js">8d395ecfd1534bc52f2697ede733558c</md5file>
-<md5file name="gl.js">554aafd4e41fbdfe81d88310ebeb8259</md5file>
-<md5file name="he.js">776d3e7b0b45496e666d0c222d2895ec</md5file>
-<md5file name="ro.js">6e27b0b67f03b2b7e9e27c6f73bb40da</md5file>
-<md5file name="sr.js">cdbf2f00cc40173559dba34b0407ec91</md5file>
-<md5file name="gu.js">9a02ce2013a481c64f2ab5323ef9b377</md5file>
-<md5file name="bn.js">3f7ec71ce8bf00af32d17edada11ab81</md5file>
-<md5file name="eo.js">8c98501f49d11930cd11018f5b67516c</md5file>
-<md5file name="hi.js">e4ae0100bc2dd1dfa8f9f9792e5f3c9c</md5file>
-<md5file name="no.js">3f61d424e62d222059e3d9b114e54573</md5file>
-<md5file name="eu.js">3e9bb121320670472c99be79df37ad4a</md5file>
-<md5file name="uk.js">878398701d2b4f92a79366adece358f8</md5file>
-<md5file name="hr.js">a31bcd82061c1d29aea61767fb4d9534</md5file>
-<md5file name="pt-br.js">6e6992107277cb5d6c7dae437de22a71</md5file>
-<md5file name="de.js">5ca808111551091c45a6c6b91a6db684</md5file>
-<md5file name="mn.js">f628f08b549f90df6f9332a24a097a14</md5file>
-<md5file name="sq.js">22bbf1056712b882fcb0e3712b8500bf</md5file>
-<md5file name="ko.js">c701b5d076dec29b96566f6f5ed4cdf8</md5file>
-<md5file name="is.js">41fb79fb13d479fc297555e981ef296a</md5file>
-<md5file name="it.js">ecb65a697fd592b4149e4c0a56fc6f37</md5file>
-<md5file name="th.js">e429800cc74245f0343705f19db80032</md5file>
-<md5file name="id.js">c3e33c1816e058858501bdcc32914525</md5file>
-<md5file name="nb.js">4f69cb8660473547df5a50ac5b16d106</md5file>
-<md5file name="ja.js">750372f7968345d08f8e03f99d085fc7</md5file>
-<md5file name="pl.js">3a74a2e94211f9966f39701c25c24d24</md5file>
-<md5file name="ku.js">f67b3160455accad85fb4082d15b90a8</md5file>
-<md5file name="cy.js">83d7d646a25b170a42992a58ac9feddc</md5file>
-<md5file name="hu.js">1d1a12787536f6c18207a29abe45310c</md5file>
-<md5file name="ka.js">3a536e553fae15137a315e22d602eb01</md5file>
-<md5file name="da.js">90a78dc63d3bcfece5d0d02e19941e5e</md5file>
-<md5file name="mk.js">f759e454f73d38cebd808908be3ab19b</md5file>
-<md5file name="sv.js">d1c6fd4dd062fa5f23531e9f99f7d943</md5file>
-<md5file name="lt.js">5a41fe6909b58519b84ed41047c87a75</md5file>
-<md5file name="ru.js">79cdbd1a21e1a76da2cde3c44e94cb87</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/dialogs" >
-<md5file name="paste.js">7a60f63f2ed6ce4b34b69ae8a12b9e7c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard/dev" >
-<md5file name="clipboard.html">3c101adddca552fe762857dd51514b05</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/clipboard" >
-<md5file name="plugin.js">abb18e4402964d4a3e2e90a1227b57ca</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/font/lang" >
-<md5file name="lv.js">8d810500e27b8e755b654caa4df91702</md5file>
-<md5file name="cs.js">aee2edefb32ae7de72e8bc2e3a835f05</md5file>
-<md5file name="bg.js">17ebed1965f283a0e355a911e67cdd42</md5file>
-<md5file name="zh-cn.js">8ae64e6251b4a32ef73969486c6bc677</md5file>
-<md5file name="km.js">d783e773a5632ec96cf785b34c790224</md5file>
-<md5file name="sk.js">63edb5dfe58fe647b48fb10076b80cd3</md5file>
-<md5file name="vi.js">a28d1de5cbbd5c1feafd57333316bad6</md5file>
-<md5file name="tr.js">7f4bcf9651de4dfe4d8bc7396fd3ced6</md5file>
-<md5file name="sl.js">fe73f93158162bb96eeb52086e15eef9</md5file>
-<md5file name="es.js">4a6e5690adc1eb3c04cb5a83e1213a0f</md5file>
-<md5file name="si.js">b33774833944d2a851d7b6e423109647</md5file>
-<md5file name="ms.js">be417aaadad9434b5e779d589dfb83d2</md5file>
-<md5file name="fi.js">e07c074f8deba3734bd30033b8a4e80a</md5file>
-<md5file name="en-gb.js">1105672b1e2eb65c7548c15007eb4304</md5file>
-<md5file name="en-ca.js">ccf3ef03ed707f213f3ff9134cf0d312</md5file>
-<md5file name="af.js">edbed6795ec27dc155a46ae5f959ee9c</md5file>
-<md5file name="ug.js">928d3512a0c9d91b855ea5481abd507f</md5file>
-<md5file name="fo.js">e9ea3271dd2ab50e653772d4175c2fb1</md5file>
-<md5file name="en-au.js">e296aa6685367e788d30a2837597d450</md5file>
-<md5file name="fr-ca.js">54bec3f653978661367752c9e628d22e</md5file>
-<md5file name="bs.js">426d8c4e93926b42afdf63888639786b</md5file>
-<md5file name="ar.js">236c8471ed1afffaa68f6c57a5976a28</md5file>
-<md5file name="en.js">665aad81deacfc0a1b9c6f89ad0585ea</md5file>
-<md5file name="sr-latn.js">08cf5c523fd24adecf802dca245e233f</md5file>
-<md5file name="fr.js">3a5a60ab0e5491fcce784f387d083302</md5file>
-<md5file name="zh.js">0fc4802635927cae7f21af301cce1f77</md5file>
-<md5file name="fa.js">0924932b2c03a76ac238c31e55644cbf</md5file>
-<md5file name="ca.js">7971ee68c1f857464a8ad7dac20985d4</md5file>
-<md5file name="pt.js">faa918ba3cbf5c46dde471bf3ff2a8aa</md5file>
-<md5file name="el.js">7354ea435851364c370985d7d24d4497</md5file>
-<md5file name="et.js">133f1492dcedd08ffcd818e991172213</md5file>
-<md5file name="nl.js">6949d9e4ff130f69e1e9dce9c7bc5f64</md5file>
-<md5file name="gl.js">a30e49c6818076ad738baf78e91da858</md5file>
-<md5file name="he.js">19404b76a93672eefa7c381cbd687a1b</md5file>
-<md5file name="ro.js">851d2b6d36a195c9d2da8810880c3a82</md5file>
-<md5file name="sr.js">875e429bf3e3dfc2f53e81d60e6c41ce</md5file>
-<md5file name="gu.js">ca699b3cf1848166fa4a572ae1dcb392</md5file>
-<md5file name="bn.js">b4e13aaa01146c08f44e6fbce5b655d5</md5file>
-<md5file name="eo.js">15ca0e1c397ecb962a119f83b0e0d77f</md5file>
-<md5file name="hi.js">0a07296598fce745fb340b4f226e0362</md5file>
-<md5file name="no.js">9e066557cf677056fb9e51d6a8318b1e</md5file>
-<md5file name="eu.js">ef4bc9523da3115da39359c6f8a63e10</md5file>
-<md5file name="uk.js">07e0d0321008a117336147347ea5dfed</md5file>
-<md5file name="hr.js">c2a132b937c15f5568baed293770487a</md5file>
-<md5file name="pt-br.js">9337c147a195beb432386401d6bfe2f0</md5file>
-<md5file name="de.js">5672b4a1646cd83c8caf4ffeafcac103</md5file>
-<md5file name="mn.js">e89f87e3fe4be3c381427546c046f2e2</md5file>
-<md5file name="sq.js">e7d5b939c4d10f2fa257cbeb76a5fb0f</md5file>
-<md5file name="ko.js">5b1c345ae0af8a8b746531f4481a8e34</md5file>
-<md5file name="is.js">f38372dd7ec12c6371bfc69a9f3441bf</md5file>
-<md5file name="it.js">1fca6974e13ca098896e13990a5b2702</md5file>
-<md5file name="th.js">9ed5fb2c7a78a2b99198bc9ea8ff36fb</md5file>
-<md5file name="id.js">6081d09eaba74eabe94d543b16f41a1d</md5file>
-<md5file name="nb.js">bbe779c69c7c34db6137c6615d59c714</md5file>
-<md5file name="ja.js">ffa8b499248bd19862899b718ee06032</md5file>
-<md5file name="pl.js">ad870aab20024333f5f00dafb69035e9</md5file>
-<md5file name="ku.js">fbea47a45ccf651d66b9773af098dd96</md5file>
-<md5file name="cy.js">7f278921f0a176026439244bc1e17f99</md5file>
-<md5file name="hu.js">55499dfa3ca8c63dac57c659336eccb1</md5file>
-<md5file name="ka.js">f492346b0c82d7f7963b0ed24c452144</md5file>
-<md5file name="da.js">9c6a59f403e1912a41fa839067582b5b</md5file>
-<md5file name="mk.js">4effc64ea261d49cb41ef4eea26c009a</md5file>
-<md5file name="sv.js">fd4ca56fa36bc5b6eb5dd7027e564994</md5file>
-<md5file name="lt.js">d6a0c9838da7670e7e0e743749adf31e</md5file>
-<md5file name="ru.js">c3d392446f6ba7187b33bb74a79adf3a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/font" >
-<md5file name="plugin.js">7916791c506e6d9ba5c997b4b139500a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/tabletools/dialogs" >
-<md5file name="tableCell.js">b02b670044deb0d0c6c7c0e08e158d9c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/tabletools" >
-<md5file name="plugin.js">b1e7296ca42039d382ed5a4af666a4c1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/format/lang" >
-<md5file name="lv.js">46b2c579d215b307ea6f519c47682639</md5file>
-<md5file name="cs.js">f0d86983e280b6364b2ded29791ce93b</md5file>
-<md5file name="bg.js">7ee09d2d39cebe9aab818ded8825d6aa</md5file>
-<md5file name="zh-cn.js">8b118d141b8b3e5083cb8522796d00a6</md5file>
-<md5file name="km.js">812e0b0be7cc0485057a51d49f3d3110</md5file>
-<md5file name="sk.js">ff320977a1116935f37ac576fd1a0018</md5file>
-<md5file name="vi.js">473c75604c49b3ce9e6ef0c0cac85744</md5file>
-<md5file name="tr.js">ec2e4850337430bd8922868931c315b8</md5file>
-<md5file name="sl.js">66f920be1d1805e448d468eaddebb4d5</md5file>
-<md5file name="es.js">d34dec52f1645063a35e7ea06631d1df</md5file>
-<md5file name="si.js">7f52a8c1446a8b39f3b2184b4779cf78</md5file>
-<md5file name="ms.js">a5a9b42f09fc50663bae6a30866a85c9</md5file>
-<md5file name="fi.js">879a8b36a6862a9f3d16cbde68ef2b12</md5file>
-<md5file name="en-gb.js">7b9bb98354bfa0cb4c6da385185af33a</md5file>
-<md5file name="en-ca.js">6191751d51da5bb0c0e50115607c263a</md5file>
-<md5file name="af.js">fc5f2424dc2629f1fd66cce3583c0a5d</md5file>
-<md5file name="ug.js">e21236622a913d00b91329f253b16cb7</md5file>
-<md5file name="fo.js">e9ece6086374f3b96f30d83685c43866</md5file>
-<md5file name="en-au.js">c532162792df71becfe1b557e4615ec9</md5file>
-<md5file name="fr-ca.js">0f0bde0a6e9b373263ee14b02668160d</md5file>
-<md5file name="bs.js">20a6e8978c06ff0d0c8ba10e62b70567</md5file>
-<md5file name="ar.js">ad3b074f50b800059b97ca1ba186daba</md5file>
-<md5file name="en.js">61a80b1c45bdf47187acd4a303731128</md5file>
-<md5file name="sr-latn.js">ae174e3c3923d123da4ed97c38206b7c</md5file>
-<md5file name="fr.js">7e4a4f85bd80b6d27ebee757f00d1161</md5file>
-<md5file name="zh.js">5213815c80ab888e913dac33e2cf49de</md5file>
-<md5file name="fa.js">73ed303d1baa66412a591394baaceeb8</md5file>
-<md5file name="ca.js">fd1e90e63ce563ecbfc3e86d51c9f959</md5file>
-<md5file name="pt.js">24c29902d209ca376efbdb43b313d288</md5file>
-<md5file name="el.js">a33c54dafb734391d511d72fce28f535</md5file>
-<md5file name="et.js">27b25332e3538ee896152374d3d0cd8f</md5file>
-<md5file name="nl.js">96d7eea17d0c1c8137b4b6011173f6a5</md5file>
-<md5file name="gl.js">09d56d5a100b0cdf0a6c0a0a4b2d7be7</md5file>
-<md5file name="he.js">8bd60a8db03080080ddd3db86db612a2</md5file>
-<md5file name="ro.js">0c283c2fedca38ac515c9c38d0d9833e</md5file>
-<md5file name="sr.js">cb73adf02a7a885af1fff21930af635b</md5file>
-<md5file name="gu.js">648b8ee67b57a2131a1681e7a085d1f0</md5file>
-<md5file name="bn.js">a7c255677fa6ddae2000a54d99967c35</md5file>
-<md5file name="eo.js">73c2cf52c013db3a34407199cd61e01c</md5file>
-<md5file name="hi.js">bf2c298ae86ac9a9017315f0efc062cb</md5file>
-<md5file name="no.js">38b6b214ec3c08716a4df82ba842f5f2</md5file>
-<md5file name="eu.js">79f24d886bce41f691dff2a4181a58be</md5file>
-<md5file name="uk.js">bcfbb9bbeba0d02466f2c3e0dbe5d5a7</md5file>
-<md5file name="hr.js">26698969f814885f602a6e98cc0ab33e</md5file>
-<md5file name="pt-br.js">a6567409e398eb1be6c22e9e7d825a30</md5file>
-<md5file name="de.js">9fe7697855378c903fd6ca477e39ac3c</md5file>
-<md5file name="mn.js">560784bf56f8e13f2cc6704ea91a10ac</md5file>
-<md5file name="sq.js">4d064d20d107427da0985e39c268dc16</md5file>
-<md5file name="ko.js">13adeb185bc4da1f790d1799c57a4e5c</md5file>
-<md5file name="is.js">9a67c1100d37fd7f8e6d516b4526f06e</md5file>
-<md5file name="it.js">294a361cb7917e4ad72720426d48f2e4</md5file>
-<md5file name="th.js">f8e786710ced1bbb94a512a87a729245</md5file>
-<md5file name="id.js">cef0502cc3063495cf0ed8589d5faa1d</md5file>
-<md5file name="nb.js">01449c67cbeaa2a8cb389717019120f6</md5file>
-<md5file name="ja.js">2ac6e19f28ff7a279f44dac7b403cad9</md5file>
-<md5file name="pl.js">a702e1d81f743786d0584078dae74555</md5file>
-<md5file name="ku.js">03d5b8f6a7e05fe561af8bbbe3b39b9a</md5file>
-<md5file name="cy.js">dfd26c7ff7fbcc37780eb8bcbce4b853</md5file>
-<md5file name="hu.js">67d575f4441b2cac67961b696b77e08d</md5file>
-<md5file name="ka.js">49592f24b459f9672bad02c559382454</md5file>
-<md5file name="da.js">ddbc03e4643c8edc265269203e1aba65</md5file>
-<md5file name="mk.js">98bc9064118e90da2c3b75b6b1c18d70</md5file>
-<md5file name="sv.js">159f965140bec8fa865543d98ff658b0</md5file>
-<md5file name="lt.js">b985d77653ca5153e9173b5414df5c72</md5file>
-<md5file name="ru.js">a9a21e63f4c04330c72b8a79100996cd</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/format" >
-<md5file name="plugin.js">505d35a020c3e95a860024c7a5eb9eaf</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/maximize/icons" >
-<md5file name="maximize.png">f1d0fbc57f779f34414f4f0849c51b17</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/maximize/icons/hidpi" >
-<md5file name="maximize.png">0f8445add9c19fc76f727d3d9974f129</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/maximize/lang" >
-<md5file name="lv.js">85567169f77de390688e544d315fbdfe</md5file>
-<md5file name="cs.js">d2f6e04c2f462935d7ac0a39202459b9</md5file>
-<md5file name="bg.js">584db3452b60853ae62fbec4f3fed0df</md5file>
-<md5file name="zh-cn.js">3b54b00adc7f1dd61b7b72846d01a12c</md5file>
-<md5file name="km.js">511c1450b8c4affa475c9a72dcfb2219</md5file>
-<md5file name="sk.js">e96b8982f3eecd354b8a1309fbf53c21</md5file>
-<md5file name="vi.js">f923cf394a3ec09acf5c0be0d09c71f7</md5file>
-<md5file name="tr.js">b52d9b6ab6397921ca48c51fe9b920e3</md5file>
-<md5file name="sl.js">283ff80aa9ea29624fbc8a47c5256dda</md5file>
-<md5file name="es.js">9b4e5f878b7ff58d19bc9048403e3fa8</md5file>
-<md5file name="si.js">6711f6af3acea07893ca4de7062e96fd</md5file>
-<md5file name="ms.js">e03f6d88bd7d5a73bba6ff78d837ed85</md5file>
-<md5file name="fi.js">0839098d2866e61089ba2206d9acc7b0</md5file>
-<md5file name="en-gb.js">22e6d79b5c0256b97859ac2c458678da</md5file>
-<md5file name="en-ca.js">792f359a06a98ad61be97c1e04294f60</md5file>
-<md5file name="af.js">eaaa62b79cf78d85b17e3050e642ea83</md5file>
-<md5file name="ug.js">c27bb791493a8c3a0897910d1bead0f3</md5file>
-<md5file name="fo.js">513f126be06516dc462279e7fc9da953</md5file>
-<md5file name="en-au.js">9ef16638b24be7b644483ff0be3f6894</md5file>
-<md5file name="fr-ca.js">6664f632ec2794f87f873a98f0d3b8eb</md5file>
-<md5file name="bs.js">7256da17ff5fcd51b04e54cae58b2f51</md5file>
-<md5file name="ar.js">18ae75b486d291f425e4358f06c1c9b1</md5file>
-<md5file name="en.js">88e4f96a6a9c6a5add80985a71fda711</md5file>
-<md5file name="sr-latn.js">176a4677cbea19ae22bd04e4a5a1a26c</md5file>
-<md5file name="fr.js">5af78d27eda0614b17a6bfe05ebe8770</md5file>
-<md5file name="zh.js">0d9e8f2c93d3e69899463f78329cfeff</md5file>
-<md5file name="fa.js">e671c0cbdb2cfa50c3b403f61dd50eae</md5file>
-<md5file name="ca.js">364a82d644f2efbfa3c54e8be3027e3e</md5file>
-<md5file name="pt.js">8085b21104a2f32acdfa8e54327f6677</md5file>
-<md5file name="el.js">2cf657d8a3c0a51709ce088c4c52b14a</md5file>
-<md5file name="et.js">e5e8e4897f6f5255da586d938398f581</md5file>
-<md5file name="nl.js">efaf2fa0bd52d1c8a35c5a11c0a8ee58</md5file>
-<md5file name="gl.js">d0076e1e08b4f3a04ec3fa787d426d8c</md5file>
-<md5file name="he.js">aa6fdf4784b2fb7553ed0b282ef65f6f</md5file>
-<md5file name="ro.js">d7adfcc1c4d0dd457ce1ea7a83e984f3</md5file>
-<md5file name="sr.js">f77e45491b3ae5618b5637bd047ff332</md5file>
-<md5file name="gu.js">af30de7a70be80c51c68a7daf1480bca</md5file>
-<md5file name="bn.js">6fa6584fadd3b270d8ed14c28b5b5e6a</md5file>
-<md5file name="eo.js">2340ef6647c8df3ca993f5c3bfd3eadf</md5file>
-<md5file name="hi.js">fbc8855c1dd6e97c844ff6a464be8e0d</md5file>
-<md5file name="no.js">3c477a25498dba0e4115a57a385c214f</md5file>
-<md5file name="eu.js">941ca059e613fbd1beda1950b55bfa68</md5file>
-<md5file name="uk.js">8ec7f7b6e8122fb21950c9e2790cbc84</md5file>
-<md5file name="hr.js">0ef9eb4728101b352a0e54130bacfae1</md5file>
-<md5file name="pt-br.js">b87d24561d1041809379e63c5b5c13cc</md5file>
-<md5file name="de.js">1297339260b5a08aaabd804f5ff9f08b</md5file>
-<md5file name="mn.js">0bad9c2320033f0a681748c49b6fabe7</md5file>
-<md5file name="sq.js">f739d7e5aa72c55076ba3907c51567cf</md5file>
-<md5file name="ko.js">ee7ed9d0a9fe0111a84861ba65c79a0b</md5file>
-<md5file name="is.js">0cb648977481b1608eb0fd2d35cdda0c</md5file>
-<md5file name="it.js">2434e9f7a150296dc220efe0f96cc5dd</md5file>
-<md5file name="th.js">2d2f350f9332044aba8fd6517ff6548e</md5file>
-<md5file name="id.js">403107806865932700a494ddd0026a76</md5file>
-<md5file name="nb.js">7c93196f6b6b371a45d1ccac761b54e6</md5file>
-<md5file name="ja.js">66fb99008c0aa47890a26ae11e67ade2</md5file>
-<md5file name="pl.js">3584fbcd77e1e3a5698778f7941b42f0</md5file>
-<md5file name="ku.js">d062b919dbb47927c94473ae74a48422</md5file>
-<md5file name="cy.js">2df4268d6719d7d641eb8545149ba74e</md5file>
-<md5file name="hu.js">a83e83cf3f03aa946ee59ea77e332c96</md5file>
-<md5file name="ka.js">098c9cee2e2276d519a41596b29dac38</md5file>
-<md5file name="da.js">b496233cebe3c0ea2e07a31630f3f4e0</md5file>
-<md5file name="mk.js">38ba9d33755a22dedac3eb54515e3fff</md5file>
-<md5file name="sv.js">5a9470926a65242e34cbd5494397f338</md5file>
-<md5file name="lt.js">0e585d336d1a97d13cd85969e086daaa</md5file>
-<md5file name="ru.js">313b3aa8af39eaeba70f90adc54dcfd4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/maximize" >
-<md5file name="plugin.js">c315400a45f06b307e2a928b8bb0d22e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/save/icons" >
-<md5file name="save.png">ca4f96b00022fc21773cdc793807b331</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/save/icons/hidpi" >
-<md5file name="save.png">8bc05b4906a79fb95d8bc5c3779bea61</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/save/lang" >
-<md5file name="lv.js">4e4f5d0da4f9b323484843d730dd5f05</md5file>
-<md5file name="cs.js">77f7069c17acbe7583a7aaa54863a953</md5file>
-<md5file name="bg.js">e0da0accd9d3e1cb5601745cb3118848</md5file>
-<md5file name="zh-cn.js">97e401958b087b42ee41d47fcbd7cddb</md5file>
-<md5file name="km.js">df7cd4654d5e8a6887e89cdfc3e5c15b</md5file>
-<md5file name="sk.js">e271da98e1b48ffa8f0faba1f52be339</md5file>
-<md5file name="vi.js">d63db58d5ca04922822ac7fec1b06be3</md5file>
-<md5file name="tr.js">36b928fc1c67ff216aa85b2319b7851d</md5file>
-<md5file name="sl.js">abd481d000b9ddae6e5bc9f40c052315</md5file>
-<md5file name="es.js">4b5ba2f72d862062688cd8503d709b54</md5file>
-<md5file name="si.js">5d1693d8228a6cc01dd1e3c64bce7791</md5file>
-<md5file name="ms.js">314c95d0d44e1daef3fa171cef5a6db9</md5file>
-<md5file name="fi.js">6b31066076cd62ac7a2b21039b100476</md5file>
-<md5file name="en-gb.js">bf10a795f02fdf2f7db0b5929ab6987f</md5file>
-<md5file name="en-ca.js">e86a3509c0ed5311507200951f740416</md5file>
-<md5file name="af.js">d931f108ba25d7871cbe3b0fd0c9bc3c</md5file>
-<md5file name="ug.js">0fc4288e8f885df3f3bbd3edc352a884</md5file>
-<md5file name="fo.js">1b448fc80ec12b58abb098e95b09e2af</md5file>
-<md5file name="en-au.js">6b90f91d18afaddee24e541942d9e398</md5file>
-<md5file name="fr-ca.js">ff4301f1bf0e3c03caf0c022e946cf3d</md5file>
-<md5file name="bs.js">f8c4707f3a9b67471054b852801dafd5</md5file>
-<md5file name="ar.js">3e941d9d249ab568e5845b3dfdad7593</md5file>
-<md5file name="en.js">acf6bad57e64e8fbedff8d3fde78a1de</md5file>
-<md5file name="sr-latn.js">9b761532aa571c82ee562b49d53dcdc6</md5file>
-<md5file name="fr.js">92d4dd57c6280c63cc50e3f7bd38d781</md5file>
-<md5file name="zh.js">ac81a7901da6ff5571a817dd995e9c9e</md5file>
-<md5file name="fa.js">d8208897922ceb99afb95ee77e2d0573</md5file>
-<md5file name="ca.js">0c50df79d516083f267b0f43ce5c5eed</md5file>
-<md5file name="pt.js">483f187ad80c6e7e52dd3ce33a4a3f1e</md5file>
-<md5file name="el.js">17115d818e0353a7d69f242dd1e040ec</md5file>
-<md5file name="et.js">9c7343768397776cf10dc721ba55f628</md5file>
-<md5file name="nl.js">a28a99fba3dbaf91ebb70a304ee3d452</md5file>
-<md5file name="gl.js">a0afc5a40edde3c60bec05f463c86c56</md5file>
-<md5file name="he.js">1b228d54f552e0b977a9b104197266f2</md5file>
-<md5file name="ro.js">fcfac9ce265a497d4907c6e0fd3f691b</md5file>
-<md5file name="sr.js">5a4f4e8a830cc5617aa08644b5868457</md5file>
-<md5file name="gu.js">dd2a9d6b3bb61736a607d397bb44bec7</md5file>
-<md5file name="bn.js">1f2b6042f028cf2f74fa22f5a9628400</md5file>
-<md5file name="eo.js">3a4e981e7337eb3ba0d6716b259b43cd</md5file>
-<md5file name="hi.js">332a892dec0dbd682378267dd6ac9810</md5file>
-<md5file name="no.js">1f58792f47090b2316e7ab8dff0b757b</md5file>
-<md5file name="eu.js">e2f187970c63bc88bed835c845a08fab</md5file>
-<md5file name="uk.js">70f1d1179fa35286c0fb1aea8018ad39</md5file>
-<md5file name="hr.js">ae26c4a7ad8db871be1c1ffac8f5d4c3</md5file>
-<md5file name="pt-br.js">b6ac82f9c20dde42d1a15dae34d685f5</md5file>
-<md5file name="de.js">09e47f0f49bf06d35d87ca4fb49509f7</md5file>
-<md5file name="mn.js">f6a1fe00173e7197d4fbcc1f8bec1bb5</md5file>
-<md5file name="sq.js">c2db9127a4bf89e27540dab11f6cffff</md5file>
-<md5file name="ko.js">8168a4c9369b3daf558cfd0e10f40b37</md5file>
-<md5file name="is.js">155a8ee4906fa6ed322e5038f3ac35ff</md5file>
-<md5file name="it.js">b20cb322d689f54ddf4261b5a0c388cf</md5file>
-<md5file name="th.js">e88f7e7dc83fbd428ad39d1d0e424138</md5file>
-<md5file name="id.js">2103aaa2430bdf15cb322b18ab97f65f</md5file>
-<md5file name="nb.js">5e3a5eef3e1966f6c7fef066bd0c5ff3</md5file>
-<md5file name="ja.js">a5caddfcff2cb3196b67f25e388a920f</md5file>
-<md5file name="pl.js">6b019c23817ebe1fd5023547cd978dc2</md5file>
-<md5file name="ku.js">7e0672ab53134d15a0630f82428a895a</md5file>
-<md5file name="cy.js">d5ea0e5b3f4ee59c2da697975cf66fd3</md5file>
-<md5file name="hu.js">b494b4e3bd52dd6b2017848004442d87</md5file>
-<md5file name="ka.js">589b91350a270fb1e1d415b8c01e45fb</md5file>
-<md5file name="da.js">e0689485d20b3d89ad7ada7fba1483d7</md5file>
-<md5file name="mk.js">7bb2bb7484870d2f8a1b808587ee8622</md5file>
-<md5file name="sv.js">85dbf65b7873a5b8e16a7be35350618f</md5file>
-<md5file name="lt.js">a18e8625095eb56f92a155905d353847</md5file>
-<md5file name="ru.js">d841ddfcf69249b6fea7dad27cff5547</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/save" >
-<md5file name="plugin.js">1559ed2016dfa0857648f982d552e2f8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showblocks/icons/hidpi" >
-<md5file name="showblocks-rtl.png">c5a13380a70c3d942c9f47bc9c66f105</md5file>
-<md5file name="showblocks.png">54b267b28293967140a526badcc79467</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showblocks/icons" >
-<md5file name="showblocks-rtl.png">da21b5ee018be5687a12c5a5de31c237</md5file>
-<md5file name="showblocks.png">133ff41644a3702f60d7a2c6bf429c5f</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showblocks/lang" >
-<md5file name="lv.js">33eb9d37aac780309bedbd367dfa7b9d</md5file>
-<md5file name="cs.js">f43b829530596e7a7ca5686a2e0c8dd5</md5file>
-<md5file name="bg.js">099547d733b446bf5576a9d98e61f6a8</md5file>
-<md5file name="zh-cn.js">3225616065c4d6800742c4198d01fc34</md5file>
-<md5file name="km.js">92268d20daa8335e3888b244e34f1621</md5file>
-<md5file name="sk.js">a26643c93a91237ce4f902269437aae4</md5file>
-<md5file name="vi.js">00fc8d87b30b91f6c7b53f7b07b4aff3</md5file>
-<md5file name="tr.js">4f4bad87986619b74e512fa04524cc65</md5file>
-<md5file name="sl.js">55ff6a279099f13a30c64dd90d25e448</md5file>
-<md5file name="es.js">6a5b84a20b5d6744c8b378ef774356bc</md5file>
-<md5file name="si.js">d672c7ac1364a6c1ae768a8726298e43</md5file>
-<md5file name="ms.js">83db029d3e555ba20c33026096385d22</md5file>
-<md5file name="fi.js">7771aa687808cb57e8f1ca9b82f9cc49</md5file>
-<md5file name="en-gb.js">b1f7c3f8a3e263904850213e499ec2c1</md5file>
-<md5file name="en-ca.js">3be72ba54273b69970f4deb1c765f2be</md5file>
-<md5file name="af.js">7fee923b4bce3c354ed833635fcc25f8</md5file>
-<md5file name="ug.js">3cd6621cb7ebf8b18f9c545970472c18</md5file>
-<md5file name="fo.js">ff91c33a9497542a3c7d613e71d68cdd</md5file>
-<md5file name="en-au.js">fdb72fb5d64b1d884a8b4f8bfc48e4b2</md5file>
-<md5file name="fr-ca.js">b6b19a1f5c8565fa5fd147955c37f425</md5file>
-<md5file name="bs.js">37835a005599a339eecccf470297ebd8</md5file>
-<md5file name="ar.js">41e8f0fdd4ee766f84ddb8ce2ee8689e</md5file>
-<md5file name="en.js">d70fc51a1be7e17a7676400a4cc0e327</md5file>
-<md5file name="sr-latn.js">49fb15445f366f40756933f3a7f4a33d</md5file>
-<md5file name="fr.js">ddda6421482133fc6ebf760e7740e270</md5file>
-<md5file name="zh.js">4cd817a326c70db4b25c865d715c9e4b</md5file>
-<md5file name="fa.js">050efb47569d68b89fdda0728718b41d</md5file>
-<md5file name="ca.js">2d0c78c2f6c18aa1b6d39647734b743e</md5file>
-<md5file name="pt.js">e95ccf0083061be790bf0a4c5bc7596a</md5file>
-<md5file name="el.js">ca8d3ec0716ce3a9dc106f49163bd2b9</md5file>
-<md5file name="et.js">a4828e471c2d89ad6117658ac6d4baf2</md5file>
-<md5file name="nl.js">10dc04fefa6c077eb0fc9d4cf6b08976</md5file>
-<md5file name="gl.js">264d5915e61d0d70c292457555a0362f</md5file>
-<md5file name="he.js">1ce8c0fb4e668c71b60bca1b713d2246</md5file>
-<md5file name="ro.js">36177571aafbbc7b748a6ac7f88c7f8c</md5file>
-<md5file name="sr.js">a1261ee684ed9c5180b6eeb47c432e80</md5file>
-<md5file name="gu.js">74e1dadce9a1bbc6ad0278613b08277d</md5file>
-<md5file name="bn.js">695f3984b4470225a5b28f73ec31e9c5</md5file>
-<md5file name="eo.js">3162dff0d73c0e11d364e83a257d59af</md5file>
-<md5file name="hi.js">d471282b57726f2e8ebf9a73d1d61132</md5file>
-<md5file name="no.js">cff140b6cd011f3ed1b2b8515dacd71d</md5file>
-<md5file name="eu.js">2eff43c00544e8d108ac301b7baf06b3</md5file>
-<md5file name="uk.js">22744e9c76554e1b64204da77f9df1ba</md5file>
-<md5file name="hr.js">38e7547ca4ed955bfbf37ad9904d15f4</md5file>
-<md5file name="pt-br.js">b10b22cd5e94f18ac574d0717987d7ff</md5file>
-<md5file name="de.js">4aa01ab70881c0b058766bf9a120435d</md5file>
-<md5file name="mn.js">f2ca8754e05addac7f5608956e99cc04</md5file>
-<md5file name="sq.js">d93d0b2e8b8ceee14deba51bba71a8fd</md5file>
-<md5file name="ko.js">8d3b04e9380f76ce10432e1145e5bb40</md5file>
-<md5file name="is.js">fe259e0af5af7530a36f03bda2bb04a4</md5file>
-<md5file name="it.js">7cdd9c45bbb60ec4c7f7fd5c2793c6e5</md5file>
-<md5file name="th.js">38ef2773a2ae7ba320afd4e1631bd1fb</md5file>
-<md5file name="id.js">a6cbe488abf24b390c8ee5894e4ba442</md5file>
-<md5file name="nb.js">eae263e4fb8ad72ecc19d7368e3e20d7</md5file>
-<md5file name="ja.js">0c85c979b3a4d7ef49a1db4c71e832d6</md5file>
-<md5file name="pl.js">39a65c3ee253571623ed7250371d2d30</md5file>
-<md5file name="ku.js">e28a50ca2f93a95a2b664fb1bda5f673</md5file>
-<md5file name="cy.js">8e1276429504053eaa454d90306e43cd</md5file>
-<md5file name="hu.js">a841286cb90b2a5239aa6ae6ccf8d9a1</md5file>
-<md5file name="ka.js">57f8c6bca226cb035a424145104d80f4</md5file>
-<md5file name="da.js">e6758c7da41b4954fbe02ef708e7b676</md5file>
-<md5file name="mk.js">635897206aea1cc4d3e7dfe2cdd5e148</md5file>
-<md5file name="sv.js">075807c22283ddd452460c45eb1be3de</md5file>
-<md5file name="lt.js">482aef6f653e109970bbc89144661b83</md5file>
-<md5file name="ru.js">084975b28a1ac65fbbff282a44dab580</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showblocks/images" >
-<md5file name="block_h5.png">4f196e19ed8ad0fdd14cb73c93fee1ab</md5file>
-<md5file name="block_pre.png">2f0f661518f1dbda9eedda2b6bee734e</md5file>
-<md5file name="block_h2.png">060e9e0bb5a4e5dc1fe0d2fb20b2c801</md5file>
-<md5file name="block_h6.png">dde71309b78bdb3b366654446adea123</md5file>
-<md5file name="block_h4.png">6c65bfeac7e5b5b28af498f2d757f3f0</md5file>
-<md5file name="block_h1.png">2c56066f59944c0167a8e4321f193913</md5file>
-<md5file name="block_address.png">5a24be2dbcae65e78db23bf732ae39fd</md5file>
-<md5file name="block_p.png">b4f2152a14d790847565aa176161acab</md5file>
-<md5file name="block_blockquote.png">198d39094c81152155f8f35108845bbe</md5file>
-<md5file name="block_div.png">05e8b4037cfbb469f9ddc37e8fc9e970</md5file>
-<md5file name="block_h3.png">5468e59e8840a0a6799d6db5d36733dc</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/showblocks" >
-<md5file name="plugin.js">b903050b3c2f2f9c2e14a68d547d6e7c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/panelbutton" >
-<md5file name="plugin.js">e553e7e359fdaacc24ac6cf70f4ef63b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/button/lang" >
-<md5file name="cs.js">f563c5d770cd2ddca273bddd51d0ea7b</md5file>
-<md5file name="zh-cn.js">b6876439fa39e5d7e38b4569fe4b0ae0</md5file>
-<md5file name="km.js">5d9111a43bb0a61dd556482ebeff87ea</md5file>
-<md5file name="sl.js">fce01c02efb6de65ee2351ceb7f4c59f</md5file>
-<md5file name="en-gb.js">4d9bac9a5df4418c150c7cb5755d8508</md5file>
-<md5file name="en.js">5ce2841167ecceaa0593eb98090f3603</md5file>
-<md5file name="fr.js">18226c20d232aef820c24b181d52a1da</md5file>
-<md5file name="fa.js">7462de701b3d82e26afaed3f6750d4c0</md5file>
-<md5file name="ca.js">4e556c738df97da21c645c6649f0ac2a</md5file>
-<md5file name="el.js">c8f9632a0d92283f0c21c9686404e307</md5file>
-<md5file name="nl.js">e7236f084a71ff0c305870e3dbcf9286</md5file>
-<md5file name="gl.js">dae7509aa3315d022b8b3123039f721b</md5file>
-<md5file name="uk.js">e739960cb1fb56aa14fe39cc78fddbcb</md5file>
-<md5file name="pt-br.js">5e3b2b96468e6a399272ee4cf7de3567</md5file>
-<md5file name="ja.js">03820e89cbc0d1394eb04849b2c63984</md5file>
-<md5file name="pl.js">e8452eb04184077138d8d57545efe898</md5file>
-<md5file name="hu.js">e1ec911fa666669ade4249a880515fda</md5file>
-<md5file name="sv.js">7e93cc4be5b856f684f8263ed6ad7893</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/button" >
-<md5file name="plugin.js">00b237debf90b03aa19f2434f4a737fb</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about/icons/hidpi" >
-<md5file name="about.png">d1cdc4aa945f242012d3314ebb90c379</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about/icons" >
-<md5file name="about.png">20e8096a0c96d4d714a8c7b0812df9ec</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about/lang" >
-<md5file name="lv.js">f1c4a408a59c2506f30b04b8c7ebec24</md5file>
-<md5file name="cs.js">687d662e2190066557c48315447e71c3</md5file>
-<md5file name="bg.js">e226079cbd508677716f1e67e0c2b3ec</md5file>
-<md5file name="zh-cn.js">cfcc4edb9d8fdc7b5d959d9a359ba701</md5file>
-<md5file name="km.js">b75017ebfe925b4d7b2afb9f019b284b</md5file>
-<md5file name="sk.js">66d59e4a4c93b2c3155faab56a011860</md5file>
-<md5file name="vi.js">5b429dcbe483e7ca76b181d296fe9077</md5file>
-<md5file name="tr.js">4e442121767f25d7f57ac109818d5369</md5file>
-<md5file name="sl.js">b36c4eeccc9e7687b62e312e60edb399</md5file>
-<md5file name="es.js">34219dc52c1412f478c26f9be6ddce83</md5file>
-<md5file name="si.js">1733eb4e925889d531e1afaf3815489f</md5file>
-<md5file name="ms.js">27f3b162fa166cd675bfd91d3d91b178</md5file>
-<md5file name="fi.js">6a419f5ecf5bb2169d4c88ccce7e9b54</md5file>
-<md5file name="en-gb.js">b2626c8a7c8ad7b9be51c6609f53d5b7</md5file>
-<md5file name="en-ca.js">1cd7ec0b74e032f0afbd1835110c9b88</md5file>
-<md5file name="af.js">0ca038e8df3efb73e1c92e37a92382a7</md5file>
-<md5file name="ug.js">fb23cac75b1dea5ae3dfb24975cf9866</md5file>
-<md5file name="fo.js">fe2bde886e0037a591ec302ed73d6237</md5file>
-<md5file name="en-au.js">12cbfda1e77501e3660fb9fdce89e9fc</md5file>
-<md5file name="fr-ca.js">fbabf3796f25c65efeaba71adffaa3cd</md5file>
-<md5file name="bs.js">c6522ae31395edbc1c88cedbe2bfcc94</md5file>
-<md5file name="ar.js">534d37a6e6c3bdfad645a4da407aba08</md5file>
-<md5file name="en.js">a3bd20b4f0b536aec482b863d26824bb</md5file>
-<md5file name="sr-latn.js">4b7eed62c19eab2ce3f5ec0dddfb0f57</md5file>
-<md5file name="fr.js">d657463b2be2b286022c63a829b3f7df</md5file>
-<md5file name="zh.js">72475c099fbb56229801bfd40d4681ce</md5file>
-<md5file name="fa.js">2dfb26c7eed3351632c30bbade02b98b</md5file>
-<md5file name="ca.js">2844d875f221d127ae17322fe4cd8e5e</md5file>
-<md5file name="pt.js">2a8b20539961ccdc54db302d0e5ca2b0</md5file>
-<md5file name="el.js">de286d5c93b7300531e60503ef646ed6</md5file>
-<md5file name="et.js">15e9864d9ea2a8f94477e883466d682f</md5file>
-<md5file name="nl.js">1158a4874d23585511cb139def353037</md5file>
-<md5file name="gl.js">32f0d7b69529c61355c4757ec37687e7</md5file>
-<md5file name="he.js">26981674da504bf0480255399aac86ae</md5file>
-<md5file name="ro.js">e9753e2685a6a9ffe15d6938eed6f039</md5file>
-<md5file name="sr.js">43e34e0d77eaf601e95ea87ab163750f</md5file>
-<md5file name="gu.js">fe56cd84d50a1585fef402535bcea5ec</md5file>
-<md5file name="bn.js">c39eab48fdb9139537207e921ac72fae</md5file>
-<md5file name="eo.js">16d3c1f635fb496053e19679b0cef8fd</md5file>
-<md5file name="hi.js">8e516f7e71fc8787af24749d7d013a4f</md5file>
-<md5file name="no.js">da82a19df2ca3ab1289fb5d353b766e5</md5file>
-<md5file name="eu.js">bbf66d184beed2679b7938efa107e028</md5file>
-<md5file name="uk.js">ea349a9f69190c4cbe423f0398a5e736</md5file>
-<md5file name="hr.js">1b8d85f16427b022d92229086a207d95</md5file>
-<md5file name="pt-br.js">4af5244b59afd4b153e8c774a37fff95</md5file>
-<md5file name="de.js">f7a64b7e9e31806690753b25abd3cad0</md5file>
-<md5file name="mn.js">404260c2d095c7eb5abeff51afd7b66d</md5file>
-<md5file name="sq.js">b0e85e9c7768548f8b0cf271fbd39618</md5file>
-<md5file name="ko.js">79561205fe5aa7f348e34b5a4e05abfc</md5file>
-<md5file name="is.js">41073876e590fdf7ad35e2d32030fd0f</md5file>
-<md5file name="it.js">a3a2f2f9e59155adf4ec27e1c1ca0c9c</md5file>
-<md5file name="th.js">a705f84bad0ebeda655035eef200ff15</md5file>
-<md5file name="id.js">2a6b79ec64e1583c702953f58013799e</md5file>
-<md5file name="nb.js">0eae092c6634629e68831278b2295847</md5file>
-<md5file name="ja.js">23f532046aad65b41df8c6f609f8fce0</md5file>
-<md5file name="pl.js">a4d7b4cf5719833de8b85a003c660241</md5file>
-<md5file name="ku.js">c4c0043ac6a4049c996c825be63e2c14</md5file>
-<md5file name="cy.js">cc7485d89c6f2d3930fcf9fe3be04753</md5file>
-<md5file name="hu.js">4b0feff6823f0c60af3df3ecda8088ea</md5file>
-<md5file name="ka.js">0f146acf599607f2b51def0622807687</md5file>
-<md5file name="da.js">7436665e004edf441d43e15c307557c8</md5file>
-<md5file name="mk.js">a9b40ac34f3ad961d8b4076da2bf1849</md5file>
-<md5file name="sv.js">ba8b35c68f8e23895a388fba66baa214</md5file>
-<md5file name="lt.js">4c975efdf2e5d3a82063629afc7280d1</md5file>
-<md5file name="ru.js">4799d28d2dfb6e621c9fb0ad4efc2c30</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about/dialogs" >
-<md5file name="about.js">9c01c7151deb4c01ab1d6526073d33c1</md5file>
-<md5file name="logo_ckeditor.png">70dd831c761a20467a6ba9e5ae736f91</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about/dialogs/hidpi" >
-<md5file name="logo_ckeditor.png">6318d2b6f7fc79b4ed0404ffbc2dac1e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/about" >
-<md5file name="plugin.js">d4eb63e694ef031ac6e47d866a87e4d5</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/print/icons/hidpi" >
-<md5file name="print.png">dbef1372cbf2a09a2937da2ba8de64ec</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/print/icons" >
-<md5file name="print.png">80e05442985a4013b2513e3a4a89731f</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/print/lang" >
-<md5file name="lv.js">cb231afc280b240f9bd06f891a8bac76</md5file>
-<md5file name="cs.js">c9a37af62da873b493e63d9bdca04afd</md5file>
-<md5file name="bg.js">6f4595225c1742546849e9563060e806</md5file>
-<md5file name="zh-cn.js">3f11953332dea768ee301fdd473878ee</md5file>
-<md5file name="km.js">533db66c8daa7675b21d06929c5854a3</md5file>
-<md5file name="sk.js">442bca7275355ca1d243480f8789872e</md5file>
-<md5file name="vi.js">6c108801e2848282658e18d4dce8ad1f</md5file>
-<md5file name="tr.js">b15ccd1e2cbe69ad2888204c96c477b9</md5file>
-<md5file name="sl.js">9304cd2325c648abaead7575c9870a8a</md5file>
-<md5file name="es.js">afeef5b70f5916024e687fd2247e207b</md5file>
-<md5file name="si.js">04ced724f3e21f46a3a318fc826f0f53</md5file>
-<md5file name="ms.js">c0a5715cefa918bcf84162bee116e7ad</md5file>
-<md5file name="fi.js">669294c29d0e81fa6bf061c6e11d24da</md5file>
-<md5file name="en-gb.js">2b716932699999c49de304b438c423e6</md5file>
-<md5file name="en-ca.js">a351b9fd2e17f1d36117a7a4b8e63988</md5file>
-<md5file name="af.js">c022af21846d6a19546cf84ab88f0353</md5file>
-<md5file name="ug.js">c9dcd6c960407a7c6df856e0864e0e14</md5file>
-<md5file name="fo.js">7728caee8caa768be46bb3e5935a99b2</md5file>
-<md5file name="en-au.js">91de20ed06553981dddafbc71f6e3e46</md5file>
-<md5file name="fr-ca.js">01ff7811a46bf81fb3cdb45d0aa45621</md5file>
-<md5file name="bs.js">287f94960a19fefdeeab3e305fdf6eba</md5file>
-<md5file name="ar.js">3354c99e3d13fa549c1975a03e4458d0</md5file>
-<md5file name="en.js">5a6ad22debe78604fe30a693a5a525a8</md5file>
-<md5file name="sr-latn.js">d587dd16b12f792c242df0a13acfb3a6</md5file>
-<md5file name="fr.js">bf54c20e2cc1f0603003c01974ceab07</md5file>
-<md5file name="zh.js">917f93e80da604aa435cb5b2c3d35d17</md5file>
-<md5file name="fa.js">74de0258ffa05523b5712d7d71984f97</md5file>
-<md5file name="ca.js">a1e3a62992d9112aeeeda28362e4ee14</md5file>
-<md5file name="pt.js">e7d43d1c9e3b8a2867bac544d2317c61</md5file>
-<md5file name="el.js">47500df641a8ec3416b461af6a284151</md5file>
-<md5file name="et.js">9fd648ec1f7464c286f96eceafb59b79</md5file>
-<md5file name="nl.js">fd5a4352cfc0365b5a9a8102090a46a9</md5file>
-<md5file name="gl.js">d4894f811c249080ecd49600cd8baf87</md5file>
-<md5file name="he.js">9bb357565c95d6fb79f7106433f58f12</md5file>
-<md5file name="ro.js">594a0b6888327f9172eb0308a455777a</md5file>
-<md5file name="sr.js">cbc52d8e46d0f8e3482c0644d643df0f</md5file>
-<md5file name="gu.js">f27516d1807413c92770f320bd1f5f72</md5file>
-<md5file name="bn.js">2509e1c6672bc4d0325b79b98c7fe332</md5file>
-<md5file name="eo.js">f6bb67304472c650935fc5609989e4af</md5file>
-<md5file name="hi.js">78d82f8b8ac1a9cf6b0645a9e230234a</md5file>
-<md5file name="no.js">f4c2722163d7f13ddd8e4c70c2db8cb1</md5file>
-<md5file name="eu.js">5129f1ba3348028f3667111746cb69b0</md5file>
-<md5file name="uk.js">b19fbbfda365bc79a6b851e60ec847d2</md5file>
-<md5file name="hr.js">1f54fca16bd38f93cb1b1c9b72feb1f1</md5file>
-<md5file name="pt-br.js">90813c26dc6b88bd481c92b3ece556b9</md5file>
-<md5file name="de.js">568ce66622eecc7aef3ac6a24b63a421</md5file>
-<md5file name="mn.js">b0fdc716e42a1bfc7bfff77d4632d3dc</md5file>
-<md5file name="sq.js">fcce102f54fc2393127bf91092758548</md5file>
-<md5file name="ko.js">a4d6765081911dc2787694e370431cf0</md5file>
-<md5file name="is.js">3e5387e454802270ff818eb8907f1114</md5file>
-<md5file name="it.js">0e207d98892f464ace855b44ed2e6a97</md5file>
-<md5file name="th.js">edc647f9bea27c5ba109d13388a659d7</md5file>
-<md5file name="id.js">6d472ed88958b1e5ece0950bfb3cd651</md5file>
-<md5file name="nb.js">0ad21fdd63f826df4e12e2ad7e6be04d</md5file>
-<md5file name="ja.js">28768c91ca1316fa7168c8d7fefeb4f5</md5file>
-<md5file name="pl.js">4371e9b00b0260e1db0dae222153b564</md5file>
-<md5file name="ku.js">eb73d3da4b84c421676593777e8e2355</md5file>
-<md5file name="cy.js">28f7ddde20e5f86d71f9876c3627cddd</md5file>
-<md5file name="hu.js">096183df1e822ad1dbcf0a5732625bdb</md5file>
-<md5file name="ka.js">ef4f3d18c2153c03b4c5ef6fb15153bd</md5file>
-<md5file name="da.js">b95fcd358ca788cc5df66b1f0c86c07a</md5file>
-<md5file name="mk.js">eae93802b5e1be0cb52fedc23cd7622b</md5file>
-<md5file name="sv.js">446048d0ef92f96f835f152b29d8c3c9</md5file>
-<md5file name="lt.js">a9a2ace0dd19f72bbd1fe902528b2f15</md5file>
-<md5file name="ru.js">0c20ea56c48466954dbb5db83f39900c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/print" >
-<md5file name="plugin.js">d644d1dad1639671a0a08ac8d7cf2cda</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/newpage/icons" >
-<md5file name="newpage-rtl.png">ec300fcfe3b8060c918daee81cb6e740</md5file>
-<md5file name="newpage.png">8a46d92eab527b57b421805b53b35193</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/newpage/icons/hidpi" >
-<md5file name="newpage-rtl.png">e84bef582a60d7baee95406173f95c6d</md5file>
-<md5file name="newpage.png">65555bcd6129a59922d4844a51f2a66e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/newpage/lang" >
-<md5file name="lv.js">4cf9f56d8067e2de5add44f6ac08aa39</md5file>
-<md5file name="cs.js">18d904050b6087e1a1878ed36f5bedbc</md5file>
-<md5file name="bg.js">34d7acef8f0f218cab66da7c0e99211f</md5file>
-<md5file name="zh-cn.js">b1e2c0f3fd0a52410a5941a05b34492d</md5file>
-<md5file name="km.js">063ddca3bb7e703ba6d53dee0fa5019e</md5file>
-<md5file name="sk.js">cb383912b1e9fef30d0309e3754cab09</md5file>
-<md5file name="vi.js">8b6d54c4ab7c9789c177231a715aafbc</md5file>
-<md5file name="tr.js">ebacade0265c156a14d9c4cd9ee1aea0</md5file>
-<md5file name="sl.js">31023158e7c92530f262bf9e159ecb1c</md5file>
-<md5file name="es.js">2c6e91a13693717a1183ea384ff43f8e</md5file>
-<md5file name="si.js">822eae32e99ca75914e16f03daac619d</md5file>
-<md5file name="ms.js">f8ea6e5c8819bb16855cf4c9c551fb73</md5file>
-<md5file name="fi.js">a1acff3c4e6bc6ab9e79fb506ae661b5</md5file>
-<md5file name="en-gb.js">16243b5859d618d8a65a7f462980737d</md5file>
-<md5file name="en-ca.js">51845e853f433558c35bfe844f0a9215</md5file>
-<md5file name="af.js">e1a4a79048eb46e05113a865859fdb37</md5file>
-<md5file name="ug.js">5b68d8515f0127c01755f84a8dbc75d9</md5file>
-<md5file name="fo.js">fcbe711b3aadb001b4fb4a5c8fa7b76c</md5file>
-<md5file name="en-au.js">e8b3b444682a1dc3efabe14653f1d0d2</md5file>
-<md5file name="fr-ca.js">939d4ddac16edb5b36a415b15b165ff9</md5file>
-<md5file name="bs.js">7034fb1f10ffbe30036cd64a82cf6d13</md5file>
-<md5file name="ar.js">0aeb60633dd742edefb678f90d680718</md5file>
-<md5file name="en.js">b3ed03c588eff65bc0815b9600b11a69</md5file>
-<md5file name="sr-latn.js">5fb9bf0b10d1e7d0e2cb2a75ab8761f3</md5file>
-<md5file name="fr.js">65d22dc7f7eb7575986f3593604bcba1</md5file>
-<md5file name="zh.js">9d5c60f11872665e5c3e7f13328892d0</md5file>
-<md5file name="fa.js">57929505563108105922fd66ed58d567</md5file>
-<md5file name="ca.js">0b703646c93500a79347305f812c806c</md5file>
-<md5file name="pt.js">31396720b520b3bb9f8b3a3fb57d27a4</md5file>
-<md5file name="el.js">e017fcd72abfcdb3ada2ece84b141396</md5file>
-<md5file name="et.js">b34a109edace291b40a56bcfa8fa2f74</md5file>
-<md5file name="nl.js">7385d48ac2e6148a6f1b60432b7dc8dc</md5file>
-<md5file name="gl.js">e1f12cc73c14812fe51a9170cceaad4f</md5file>
-<md5file name="he.js">47cd20e59d9e9e47f3cd269b9d6f7579</md5file>
-<md5file name="ro.js">e514fbc10583cf759b04cdb8443e0a2c</md5file>
-<md5file name="sr.js">5087e6d1810e83275b6af4fd1726a70e</md5file>
-<md5file name="gu.js">52dbc06b316a3b71818fc804c9fa420e</md5file>
-<md5file name="bn.js">a204d5f90107479e7316f683c9c4607a</md5file>
-<md5file name="eo.js">fb65d82191472109ddf59b62d5779f2c</md5file>
-<md5file name="hi.js">7e1d2f38a17f9b41650d4bda8d3da264</md5file>
-<md5file name="no.js">9f68c3e8bfa450b72ee7d17acafb297f</md5file>
-<md5file name="eu.js">cdcac5329fc8f57a9a7b420a88dc0ebb</md5file>
-<md5file name="uk.js">57ad3dbec6bb122f9a0ca95f67c70814</md5file>
-<md5file name="hr.js">b4f13b20b3790186ae2baf051be79aec</md5file>
-<md5file name="pt-br.js">0283fc038e449adcd3616d4419f5d093</md5file>
-<md5file name="de.js">f3d44a5a85bbd3e013cd4de3341e89d5</md5file>
-<md5file name="mn.js">9874abc53037f2f38f511e742e30ee4a</md5file>
-<md5file name="sq.js">e4ee16b8821c426711570560dcac5871</md5file>
-<md5file name="ko.js">cd859bb39099199582d4e94380982de6</md5file>
-<md5file name="is.js">0d879986f44f9c64632ccf168da9e4cc</md5file>
-<md5file name="it.js">125f68078e5e6a1e9d11b75d15797900</md5file>
-<md5file name="th.js">2ea9f6817c3f70cb4c3d7ecb451b4746</md5file>
-<md5file name="id.js">a33b0b16b842e712d9cdd77a7fdcbbc6</md5file>
-<md5file name="nb.js">1ba07c2b0466d37a57cabd2bc12739f3</md5file>
-<md5file name="ja.js">1c4b03c6d879c610365522f9d88fb95d</md5file>
-<md5file name="pl.js">9d9d72c07c81e41dd427559c6d4007a8</md5file>
-<md5file name="ku.js">a46a6619f90e933ada76af43913e6996</md5file>
-<md5file name="cy.js">592bce160e3975e31cb006370388efd7</md5file>
-<md5file name="hu.js">b1581f30826aeb7c9bf791425b67887a</md5file>
-<md5file name="ka.js">9c8bac10a946e485681c9854eb064c0b</md5file>
-<md5file name="da.js">beedbd377d6231a9c75215c7ad0660ac</md5file>
-<md5file name="mk.js">b18f1fe773329e1c368190a05096adea</md5file>
-<md5file name="sv.js">a6c8966c4e93226e8fcccf99685cc4e7</md5file>
-<md5file name="lt.js">fa3dc191f76e8fc8ed5790524bc1ed43</md5file>
-<md5file name="ru.js">502d5d6d029eaab690bb4010ab28077b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/newpage" >
-<md5file name="plugin.js">365c361ff007348b8f79006a19e74e09</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/horizontalrule/icons" >
-<md5file name="horizontalrule.png">8515eb9ce71bacc468ecdbb2dc766578</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/horizontalrule/icons/hidpi" >
-<md5file name="horizontalrule.png">c1efaf570aa80e11b02bafff0b51c16c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/horizontalrule/lang" >
-<md5file name="lv.js">2dad3c71219a4201fab5e505272019d3</md5file>
-<md5file name="cs.js">14a2e420e7492217fd0a86991d52528a</md5file>
-<md5file name="bg.js">7a90e0bb0618c3ae3dea1978c403bd84</md5file>
-<md5file name="zh-cn.js">034798d01e3c2c0c2d2bbb394eb8501c</md5file>
-<md5file name="km.js">1deedd61a314c31b6567833c89d052ae</md5file>
-<md5file name="sk.js">d934252bd228548693aedbf8169f7ff7</md5file>
-<md5file name="vi.js">b3e45580bd7dbeed7191060313256642</md5file>
-<md5file name="tr.js">b51ffcd2c91d8ed96df607002becd1e3</md5file>
-<md5file name="sl.js">9586da17ac1f90d08d20b04d17b49f97</md5file>
-<md5file name="es.js">5c0b1e4aab4fe83bb5330e6f632b1ea0</md5file>
-<md5file name="si.js">bd51080f0518510a2ff4819a60029b1b</md5file>
-<md5file name="ms.js">6c6b1ea9bf7b6758126b5ee6527f76da</md5file>
-<md5file name="fi.js">d7664d91439f8c6a2a214320a863e130</md5file>
-<md5file name="en-gb.js">e6ef40bd74c37ab1e302a156adb03a35</md5file>
-<md5file name="en-ca.js">a8ce7e2c7f0c51d8cd52972cfd2afa2d</md5file>
-<md5file name="af.js">5a12a23a67e5681ccbc279a9f6fbae15</md5file>
-<md5file name="ug.js">6372450456caa25eaaa1a45bd56f63cc</md5file>
-<md5file name="fo.js">f71ca4688b411be6f52e48161d179025</md5file>
-<md5file name="en-au.js">994719b22ca2628db29cbef70e13c4e3</md5file>
-<md5file name="fr-ca.js">05ac3a78463aeb98058b9a10fa9a55fb</md5file>
-<md5file name="bs.js">a139de011e1380dc9a4413f1e0f2fad5</md5file>
-<md5file name="ar.js">fe20f28c0334943984c87baa623b1c50</md5file>
-<md5file name="en.js">8bb10f34c327adfe6d2aaa2a077edf5e</md5file>
-<md5file name="sr-latn.js">d5f86a87cb6212b2388a84ede7d51074</md5file>
-<md5file name="fr.js">cb1cd97b07c77e0835240f7e63012247</md5file>
-<md5file name="zh.js">945622657924660c72b73a27d5f63e1b</md5file>
-<md5file name="fa.js">b526f428e8855806068da83cf63265cb</md5file>
-<md5file name="ca.js">1d017bfd1e71478f184a62b9694a684c</md5file>
-<md5file name="pt.js">eb9bdf965678a08dcbf378ad2e5daa4b</md5file>
-<md5file name="el.js">b0c2cc96f55278e5a21991575ce8024e</md5file>
-<md5file name="et.js">e11daaa41501227ae40484f4854f32bd</md5file>
-<md5file name="nl.js">61cb2d4c36d4ba917c167447c2233d2f</md5file>
-<md5file name="gl.js">21d06f61277c86ed48e6e8f4e49ee3b5</md5file>
-<md5file name="he.js">4acda9b26cbc697a6817cc64e254e10b</md5file>
-<md5file name="ro.js">30f9e470cb903ff4484593b5a0c6697c</md5file>
-<md5file name="sr.js">cb55b769623d604a50ffab79b3d4d502</md5file>
-<md5file name="gu.js">1fba419b5fb66ee748bc47c5c94d1605</md5file>
-<md5file name="bn.js">e128b974dced4b7a258e148f1533be4f</md5file>
-<md5file name="eo.js">8bb532d8e283ba1068788410dbc08329</md5file>
-<md5file name="hi.js">9c377d1fc734ab4b3692e6049ea498d9</md5file>
-<md5file name="no.js">c667df92801521d707613b2b5e179c5d</md5file>
-<md5file name="eu.js">81738a615ab84bda20eec985ab2e23cc</md5file>
-<md5file name="uk.js">c1a3b889c21c19cf94e40928deba6f08</md5file>
-<md5file name="hr.js">fb24e12af22a6e0c5492056d6869f22c</md5file>
-<md5file name="pt-br.js">afea44b4611b127391c2765e67bb888f</md5file>
-<md5file name="de.js">cfae719624412d6aed6930f865f3c639</md5file>
-<md5file name="mn.js">7bfaaf1c3f6cfb3cd6ebf94aaaeeab19</md5file>
-<md5file name="sq.js">198341911abe0c15937eee94088bdb86</md5file>
-<md5file name="ko.js">4a7fbaa242a59298e87bb07fa6d168df</md5file>
-<md5file name="is.js">89baa9f6ab06c02e7939a4eca7c2b9b9</md5file>
-<md5file name="it.js">eb6c20862e0fd101f3b158c5591008dc</md5file>
-<md5file name="th.js">008e75649675852a7ab2bd3e8418b215</md5file>
-<md5file name="id.js">d72021d07a222d699ae2345de41cf7e2</md5file>
-<md5file name="nb.js">8c9ac43196d509da6187f66bf9683bf4</md5file>
-<md5file name="ja.js">359c3d1d5b8ac6537a36ee5a83ded4d0</md5file>
-<md5file name="pl.js">564a09b37cebf4b1806481b2cfe4ea3e</md5file>
-<md5file name="ku.js">daa3a460cde0c3e4473b68ff14dd5a75</md5file>
-<md5file name="cy.js">f8f54d966d531f28a305047fe818036a</md5file>
-<md5file name="hu.js">aa9b93b7270a1a73b4ce3754b7bccf73</md5file>
-<md5file name="ka.js">5f9a0a067a1b83b665598ecccf5a7b63</md5file>
-<md5file name="da.js">384cba065ba0bd57ae862c3288fcbcba</md5file>
-<md5file name="mk.js">02a14ab247753e76996aff89e93bece9</md5file>
-<md5file name="sv.js">5bbc25117d805eb14b98b96743a91c3a</md5file>
-<md5file name="lt.js">70c107b517f82576cf21b333ea681b3d</md5file>
-<md5file name="ru.js">f9310a1c87b2453c24c0c8eb0d525277</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/horizontalrule" >
-<md5file name="plugin.js">08a21603a4c8b0fbae33477838b82b00</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indentlist" >
-<md5file name="plugin.js">bd6cf96e05438cd47803d19ed3ecbd5d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/scayt/icons" >
-<md5file name="scayt.png">254df5a7ff156ec65a3997a119999809</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/scayt/icons/hidpi" >
-<md5file name="scayt.png">70ab052ed51dfdad78f49615a6f69e60</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/scayt/lang" >
-<md5file name="lv.js">2638e97161f75de012118be31a22004e</md5file>
-<md5file name="cs.js">0929f0b5e3254b6e40b527b1abce1815</md5file>
-<md5file name="bg.js">5d7b9b21d92eb1240486722d97d74f0a</md5file>
-<md5file name="zh-cn.js">b9b21157ffad702054136dfacad80e75</md5file>
-<md5file name="km.js">95d2d2e08aaa0d1426b4cd4093ff5101</md5file>
-<md5file name="sk.js">a592864eae4b1fd55af82e98ba07d326</md5file>
-<md5file name="vi.js">33f550335ca0c18fb4af1bbe009e435f</md5file>
-<md5file name="tr.js">8f9d5c66907f6a702a3395d2f6202cd5</md5file>
-<md5file name="sl.js">3ba6aa4f3f9c0a7b3198846cdd8d10db</md5file>
-<md5file name="es.js">564d13340a864d2ae601a0ddfbb1cacc</md5file>
-<md5file name="ms.js">ae4b2db4b903230ee38d2ee40a2c6e56</md5file>
-<md5file name="fi.js">17f4d13b497c8ce80783340248cb0f26</md5file>
-<md5file name="en-gb.js">f0e5b29c15f18eab63138d7589148fcd</md5file>
-<md5file name="en-ca.js">78450c1ab58ef126f29a21a9ac2e6dc2</md5file>
-<md5file name="af.js">0848a1e0e3751ffe698f8f929eaf59ac</md5file>
-<md5file name="ug.js">ae4d5ffcfba43c43792a00948e400a4c</md5file>
-<md5file name="fo.js">00c223cc64d4c68665cf8d3c0d32a632</md5file>
-<md5file name="en-au.js">c046f7d33ce43b59ca977140b91c8383</md5file>
-<md5file name="fr-ca.js">8efcc3d6ab70c2ec60d28732b3e08c9a</md5file>
-<md5file name="bs.js">f35a9a0c87ef782b937b3e24fe981c06</md5file>
-<md5file name="ar.js">ce0378f488c6ac4a0149d63ce950198d</md5file>
-<md5file name="en.js">dbc68fab8f657c2fdb11ff969b55109b</md5file>
-<md5file name="sr-latn.js">041cd0d0dae4436f410042efe7542929</md5file>
-<md5file name="fr.js">8d7b7ab42b7cd5334f5e18c0441abc9d</md5file>
-<md5file name="zh.js">98e5199b0c3a6d3dab240f22a2e1c17c</md5file>
-<md5file name="fa.js">763fa2a8c242e5541f0e9c59e5be0c91</md5file>
-<md5file name="ca.js">ea65decdd7c578fcfc738ed1c77bdb26</md5file>
-<md5file name="pt.js">d7494cd76abc606a2c200a217d2a6a07</md5file>
-<md5file name="el.js">6b7052928a1a865a23f59fba1d313a88</md5file>
-<md5file name="et.js">7929c963cdf3a8850d7d54928ca662eb</md5file>
-<md5file name="nl.js">62957cdfb1790a620593f891892b4cf4</md5file>
-<md5file name="gl.js">94dab6d35ae6fc0993b7040012c37e3d</md5file>
-<md5file name="he.js">d4cc0a019c0056f9c6001fbb2210b766</md5file>
-<md5file name="ro.js">8472dd267a7c0f36258c1b1c33fefe1c</md5file>
-<md5file name="sr.js">e1ba46513dcffe328ed67ade611e6582</md5file>
-<md5file name="gu.js">885828de452fd48669a7665a5c69e88f</md5file>
-<md5file name="bn.js">c1178fffd3c603cd2257f1542c072dd3</md5file>
-<md5file name="eo.js">43aa2ae8adc95e1b176fc6e5428a096b</md5file>
-<md5file name="hi.js">d3dbcc4565d7661ee3f45e84401bb34d</md5file>
-<md5file name="no.js">c36c3335ffe9f52485f7f9246d991b1b</md5file>
-<md5file name="eu.js">b47d2bc1ca376839d48dd683583b54c2</md5file>
-<md5file name="uk.js">8b3785fa44dffe6cebbd50d78d84af3b</md5file>
-<md5file name="hr.js">20190b4ea32a3cdaff054deb7c00f467</md5file>
-<md5file name="pt-br.js">b93d26deda65dbd18455cc7479f06e08</md5file>
-<md5file name="de.js">39c3e78a97c37b5a302826a4684a3e75</md5file>
-<md5file name="mn.js">68ecba33735d58488e91f9fe817b5dbc</md5file>
-<md5file name="ko.js">8ae6d716d87e25ff59e1c2d3d49150d2</md5file>
-<md5file name="is.js">3c0a6e724f60b955074b1425c0dc52a6</md5file>
-<md5file name="it.js">5d644468784d7d7951291b2a6bcfcc77</md5file>
-<md5file name="th.js">8acbae37164eef94b59dbe8742676e89</md5file>
-<md5file name="nb.js">1f56f8a03d45c2a8ed59c019d94eaa5c</md5file>
-<md5file name="ja.js">2be3062d24c05edc8df4a0c9b1d2b2ff</md5file>
-<md5file name="pl.js">8110985385772ac7b2d9e90adf08f769</md5file>
-<md5file name="ku.js">b26b6cd27dff99f6d51ca1e3a1ef4743</md5file>
-<md5file name="cy.js">fc547a5eaa20d5e5bb777e52640ffbb2</md5file>
-<md5file name="hu.js">9abdf8612325424ada32c03738082e68</md5file>
-<md5file name="ka.js">6abb3a6b47621e4b1aacc1e3521ff7c3</md5file>
-<md5file name="da.js">4b48b9e8b02f76f13c5f39d17f1ad71b</md5file>
-<md5file name="mk.js">f14944e3d5877e8dc213a0c81ad67214</md5file>
-<md5file name="sv.js">29ab57ec4a083e9c51eb073002d08682</md5file>
-<md5file name="lt.js">c240bb7dbb2e85d910b8c85343d68c80</md5file>
-<md5file name="ru.js">b753dbc9b05f352c159b88304815cb7c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/scayt/dialogs" >
-<md5file name="options.js">1e3f6f4bcbcec87e78be9a8cd0c11dcc</md5file>
-<md5file name="toolbar.css">80cf4a974ffe1a69b6d6b85abb391d6f</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/scayt" >
-<md5file name="plugin.js">ad8c831d187419e5499883a1ecc2df68</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/selectall/icons" >
-<md5file name="selectall.png">c4d652a582af1421eb9a0b1f99c6d250</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/selectall/icons/hidpi" >
-<md5file name="selectall.png">c4dc9ebb0311552c6f3dac4b11334a5d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/selectall/lang" >
-<md5file name="lv.js">c46ecff421b412f95a3a1c54617557f0</md5file>
-<md5file name="cs.js">4816217f35fd66a1de1c7ebc7c976651</md5file>
-<md5file name="bg.js">7624ab4dba58de5f82b466f4eb08d9bc</md5file>
-<md5file name="zh-cn.js">91819a724a8053510d604238e4b58ab3</md5file>
-<md5file name="km.js">d93a7cc7cb0762305676fc94a39a4a09</md5file>
-<md5file name="sk.js">8cc8036acb5131a42149179eb99973de</md5file>
-<md5file name="vi.js">e292cf48a7bf4a79c9773a31cf2934c4</md5file>
-<md5file name="tr.js">1f99f7b52822d4c59d916447dfd7559e</md5file>
-<md5file name="sl.js">1894d5f165701a24bf022017230c8df9</md5file>
-<md5file name="es.js">d72b2aad7510c0e3ef72683b26fd027a</md5file>
-<md5file name="si.js">90bd57b60223a7433a16ceff05d97344</md5file>
-<md5file name="ms.js">a6e50f2dbe1ff84ca43f5bee0ae51275</md5file>
-<md5file name="fi.js">edcebd7174cb5d346fc1bb0e8ad4d6ea</md5file>
-<md5file name="en-gb.js">5ad064f7e5e4973c6ff8adf20fdc9097</md5file>
-<md5file name="en-ca.js">7e81750ff74ff1569318f9f795584910</md5file>
-<md5file name="af.js">cc7099e04e2b587cd785e517e1592eb9</md5file>
-<md5file name="ug.js">ec3a39c8e3b05819cb4f9ebe74fd3323</md5file>
-<md5file name="fo.js">bd2acd5c4e1dbf8abb0e8cbcd63941da</md5file>
-<md5file name="en-au.js">7a268a6642797b76d4f627f39c64a2d5</md5file>
-<md5file name="fr-ca.js">15f0bcb8fe5c5b09d84155879155c6a5</md5file>
-<md5file name="bs.js">9bc75d901e6f5d74521f9508f66853d4</md5file>
-<md5file name="ar.js">134f4b70f31132a44eebd688fa862959</md5file>
-<md5file name="en.js">02194779d3c20eef4dbc9a30b72385db</md5file>
-<md5file name="sr-latn.js">75f56656276c886a12736c9c0a7befb8</md5file>
-<md5file name="fr.js">6bd22e44e3eee865a50c7bd147353352</md5file>
-<md5file name="zh.js">97fe3406679f991bec2a84bb0d648907</md5file>
-<md5file name="fa.js">8b1b7e2797bfd86c3682f589ce17ddaa</md5file>
-<md5file name="ca.js">cf70c10a5cecf9ae26fb704e9421d237</md5file>
-<md5file name="pt.js">aa92065e9d29a0d969480e18d9a7c45b</md5file>
-<md5file name="el.js">28d916b5a88825b69f709262e601b0ee</md5file>
-<md5file name="et.js">5cf74ca41c491f9c15151253feaaebc7</md5file>
-<md5file name="nl.js">32d0997f17421fbb3a86ee4c2bf67a9b</md5file>
-<md5file name="gl.js">ed99d9404cdfa63b7f6a97e287c62b97</md5file>
-<md5file name="he.js">5da7eade584cdea9e697d1c0e2f2c19f</md5file>
-<md5file name="ro.js">45eabec8f4f074109c3e824500dc08d9</md5file>
-<md5file name="sr.js">283893fc0dbd7cc5b7679ae48b412f14</md5file>
-<md5file name="gu.js">eaba0797ccfdf0276124f6f99797bf99</md5file>
-<md5file name="bn.js">c117bb40e20b69f3da526944681473d8</md5file>
-<md5file name="eo.js">22cabd0be8bcbf938fa644ae3a6bffd5</md5file>
-<md5file name="hi.js">ebca6beafd3730935bbc822b52bd5603</md5file>
-<md5file name="no.js">b2e047eebfac3ea92afd25ef98666658</md5file>
-<md5file name="eu.js">0be5ff53733331351419a804fec2d65c</md5file>
-<md5file name="uk.js">5983992ebbf53f21ceeacf95623eed77</md5file>
-<md5file name="hr.js">2b4d9dcaa5ab568a61ed251819fef29e</md5file>
-<md5file name="pt-br.js">565d4f7285e25e20677d947592f18615</md5file>
-<md5file name="de.js">76c81607e4038f4d5c31f2c55f4b2f12</md5file>
-<md5file name="mn.js">02c42629f742ab4a4d9a27ce6c703143</md5file>
-<md5file name="sq.js">1b55b35346283436334c8baf3fa3dfab</md5file>
-<md5file name="ko.js">c6d7514fec5ea3f911328b5a2ff65bc0</md5file>
-<md5file name="is.js">a08d4045664a3a807699f0537bdb93e7</md5file>
-<md5file name="it.js">ec5ee3c5d17db65eacb68f961fb6b373</md5file>
-<md5file name="th.js">384e3d95df61a3f08137014035ee77e1</md5file>
-<md5file name="id.js">fc28aa5e01775d72c6c509d671993bcb</md5file>
-<md5file name="nb.js">768ab1e7379aa67845b73ae6b7114be1</md5file>
-<md5file name="ja.js">820ff8a3aba1d08a4966c828848aed56</md5file>
-<md5file name="pl.js">60424c97daad69207a74991017e259ac</md5file>
-<md5file name="ku.js">aad364a44a1ef32ef0e722b4ddf900b3</md5file>
-<md5file name="cy.js">3bb9937553a7e043b34145d94372c4cc</md5file>
-<md5file name="hu.js">61ae7c24ef5c91164263b3542e8b8f0b</md5file>
-<md5file name="ka.js">92d3ec3fc776d88fbc6c60503afa5556</md5file>
-<md5file name="da.js">f1b9b989b039f70783a38b8abcc29d3d</md5file>
-<md5file name="mk.js">27cf3a2166066e7c046a92c69e173696</md5file>
-<md5file name="sv.js">57742bc53357148832b47a87e3369791</md5file>
-<md5file name="lt.js">bac68714b2912742376e52bae764ec59</md5file>
-<md5file name="ru.js">3270657a91feebc923013a5b1dd26e1d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/selectall" >
-<md5file name="plugin.js">a81d80968d54b8e6d31db1fbbd2763c8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/undo/icons" >
-<md5file name="undo.png">57b267688a0a287fbef73fa98384f51f</md5file>
-<md5file name="redo.png">4d8b00e613dc9a2e4a4ffe3d485aa7d8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/undo/icons/hidpi" >
-<md5file name="undo.png">51a3723412559c54daad822880716e2c</md5file>
-<md5file name="redo.png">1c047c61f8c7c14d3e92634d7506de32</md5file>
-<md5file name="redo-rtl.png">51a3723412559c54daad822880716e2c</md5file>
-<md5file name="undo-rtl.png">1c047c61f8c7c14d3e92634d7506de32</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/undo/icons" >
-<md5file name="redo-rtl.png">6b93fd06a12f6bc0c74fc10dee98631e</md5file>
-<md5file name="undo-rtl.png">4d8b00e613dc9a2e4a4ffe3d485aa7d8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/undo/lang" >
-<md5file name="lv.js">ae3cb083c91bbf97212cd97e02243609</md5file>
-<md5file name="cs.js">1a4b8ccfffe1da99a0244108beb16543</md5file>
-<md5file name="bg.js">d1f746d9bc0926785c04b811f3fb7966</md5file>
-<md5file name="zh-cn.js">8ee4be957243e408f83238f60768a62e</md5file>
-<md5file name="km.js">d1d27ba3c484d69a50ea82359699baf7</md5file>
-<md5file name="sk.js">3f08c5537c877607b1b38a3f4628d300</md5file>
-<md5file name="vi.js">201ec03c86cf2054397dc8b2cdee587b</md5file>
-<md5file name="tr.js">dc20105ad59ac69313a47db1691e716b</md5file>
-<md5file name="sl.js">b7ba3ffdaf7c925cf02db8f6af000e19</md5file>
-<md5file name="es.js">343d7bec72f569a5e5d7ccd4634823d4</md5file>
-<md5file name="si.js">1afbf4b8ae361df5b07e40f4ce036b28</md5file>
-<md5file name="ms.js">4f0cba964ff3c374759ea96f7c500307</md5file>
-<md5file name="fi.js">6a1dd8ab3e701824124cb63eaaa81faf</md5file>
-<md5file name="en-gb.js">bebbe5127ca9f7c16d10b78d6f4efe8b</md5file>
-<md5file name="en-ca.js">bee70c7277935058bee76570544c2e7b</md5file>
-<md5file name="af.js">1101b7fa25c611245ec0bf3c5a7dba6e</md5file>
-<md5file name="ug.js">c7f7b6a9269e9c5218bd6cf36f6c2a23</md5file>
-<md5file name="fo.js">5f0a85714b27bae10b591d97ec559d20</md5file>
-<md5file name="en-au.js">65fba3e749586eb076249ba3c482b35c</md5file>
-<md5file name="fr-ca.js">49589a58849149505f18c39fabd41c8a</md5file>
-<md5file name="bs.js">6aed0195f236b45819a8c39f4f2bab8a</md5file>
-<md5file name="ar.js">5e3e069f70a0ded9d0ee0eb7cf0406dc</md5file>
-<md5file name="en.js">66aacc6ffd7e53adc3ca755317c22a63</md5file>
-<md5file name="sr-latn.js">697e2261a085361a28067caeac366fd1</md5file>
-<md5file name="fr.js">4048c98914cd79c0aae66280000b3561</md5file>
-<md5file name="zh.js">3a2206dbc797fe66ce48b9cc878256f6</md5file>
-<md5file name="fa.js">6301df0d24884adc8c535de1c5a9e98b</md5file>
-<md5file name="ca.js">f8fd950310c41d00a0097b5db79de259</md5file>
-<md5file name="pt.js">4a738bce271c763b1f0ccf4b442a44ae</md5file>
-<md5file name="el.js">ce6d51be7d2712bb25fb3da7ac755b23</md5file>
-<md5file name="et.js">341af811b1496a4696c5d19ec20bbee2</md5file>
-<md5file name="nl.js">fa440492f96bcc0fdc48b5bd66e21389</md5file>
-<md5file name="gl.js">51238c690fbcb8afc6eaf6f27459ce5b</md5file>
-<md5file name="he.js">4e34b926b397349a7a399d9e2f6a623f</md5file>
-<md5file name="ro.js">87c853d3f2fdcf32be3154c14324b626</md5file>
-<md5file name="sr.js">a85d6f6c9dfdabdbad59f048657ab05d</md5file>
-<md5file name="gu.js">82d25454413650c9afce0c152f621456</md5file>
-<md5file name="bn.js">83e71e5bf598cc37ba54e1f4186a46f0</md5file>
-<md5file name="eo.js">5b16411a39be252dce43f6f84ee0b023</md5file>
-<md5file name="hi.js">93022bac37cadac7f1bdcdca314145fe</md5file>
-<md5file name="no.js">2087699af94eaaa7177b92c9c0ba9e72</md5file>
-<md5file name="eu.js">3dfd4391047ce944aef697e571dfa124</md5file>
-<md5file name="uk.js">e6c29e3ffeee1f20d265b95decb300d1</md5file>
-<md5file name="hr.js">5dbf6b1ee18e05b2f68efea7cddd6581</md5file>
-<md5file name="pt-br.js">edbbea920740cbcfa074607d3b169ed9</md5file>
-<md5file name="de.js">91af40689eb5e30ab56ef95322d63dd9</md5file>
-<md5file name="mn.js">d523cc1f7ca3a4a13e11ad16e4e801c1</md5file>
-<md5file name="sq.js">8c6bca9edd3666ae2d7fe6004c8046ce</md5file>
-<md5file name="ko.js">a6dfe45836ad9efae21ec474f6b0a360</md5file>
-<md5file name="is.js">24cb8074e5621e8703181b98047a5a12</md5file>
-<md5file name="it.js">098a74062c560323cf5b527bed594155</md5file>
-<md5file name="th.js">5815ec05a565d909cb97507b294e76a6</md5file>
-<md5file name="id.js">aa85f538dd855b04e154b6f9603973c2</md5file>
-<md5file name="nb.js">f9326b6eca3ff2cf4c6ad9fd2f238b7e</md5file>
-<md5file name="ja.js">5420a4876d0f545323defab7add12c1d</md5file>
-<md5file name="pl.js">c0e1028850e1771e7260629853155452</md5file>
-<md5file name="ku.js">21c2bd507e206a1bfe3384839b996bdf</md5file>
-<md5file name="cy.js">d5a99c1a3afdfd41705bfa5fadf18b04</md5file>
-<md5file name="hu.js">22da431a7c7f89ec111dec1a80591058</md5file>
-<md5file name="ka.js">6badad2af73e4b042c8887c0addc7f8c</md5file>
-<md5file name="da.js">07cf193499b14b4aa2dcd2d8d0a81332</md5file>
-<md5file name="mk.js">531aa6eb0b9d51d6b45b54e1d8f7adda</md5file>
-<md5file name="sv.js">59223a63757c54efd157db106076951d</md5file>
-<md5file name="lt.js">a233c31b4d3824db7be5a7a8bd453b20</md5file>
-<md5file name="ru.js">bc544b7cf64e2e4b50074bbe9e783ca6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/undo" >
-<md5file name="plugin.js">0e3b2d7155b680d864cc63dd7a085610</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak/icons" >
-<md5file name="pagebreak-rtl.png">e5bf44e2803bf12aaa79208bc33bf39d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak/icons/hidpi" >
-<md5file name="pagebreak-rtl.png">825ad0b1b3d2856a9919701895c301dc</md5file>
-<md5file name="pagebreak.png">59768a023b4746ce905b48b15b701eb5</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak/icons" >
-<md5file name="pagebreak.png">625acbfb79ef0ef7c548312fad2026c8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak/lang" >
-<md5file name="lv.js">9fed987110c75de38190452dbef8fe5c</md5file>
-<md5file name="cs.js">477d93050f1263cc40ac9d69d1f535aa</md5file>
-<md5file name="bg.js">3d878037e552a800898f385252a66132</md5file>
-<md5file name="zh-cn.js">27052de320e652808dc308d56fa81fe7</md5file>
-<md5file name="km.js">6bfd83d6b548af1f492860ad787efd3c</md5file>
-<md5file name="sk.js">bd55061fbf3f78a7b9b9464931850d24</md5file>
-<md5file name="vi.js">f48d59c4c07611f93063308a88147075</md5file>
-<md5file name="tr.js">a3c84f9f621ddc0c5b98da56c129dba7</md5file>
-<md5file name="sl.js">84a6b4aa628062a1976a05c7de342247</md5file>
-<md5file name="es.js">a0b1c3ef87e7644e083a4686df3c52eb</md5file>
-<md5file name="si.js">873efeaea1762bc8e6de524749521803</md5file>
-<md5file name="ms.js">bc0f7acea73bdce2b414d78535b14cfd</md5file>
-<md5file name="fi.js">e385f2a5a742c08c33df37979ac7ede2</md5file>
-<md5file name="en-gb.js">eba21292ad522a1f5a116d783cae786c</md5file>
-<md5file name="en-ca.js">6ef2e8666ba15887ea19211bdaee8e23</md5file>
-<md5file name="af.js">113bb3671892d3362a7af53f18e00a5d</md5file>
-<md5file name="ug.js">5f5f5bd5be56890be74c690e2e4f6086</md5file>
-<md5file name="fo.js">7878235b2a665f85fddf9c4766d0a291</md5file>
-<md5file name="en-au.js">e0b09b89fcc0a67e97eb9ad4d2d5f739</md5file>
-<md5file name="fr-ca.js">13ea49b54ede207b559c1a3fa8229e60</md5file>
-<md5file name="bs.js">642139f0e9e5b65eda856a5f326fc79c</md5file>
-<md5file name="ar.js">0c06b2e3cdf0f98380812e3aba9f4dc3</md5file>
-<md5file name="en.js">dfa31e414e448bae60fcf506f383c1e8</md5file>
-<md5file name="sr-latn.js">b3a3740510a41e510d98725bfde5aca1</md5file>
-<md5file name="fr.js">be0e97b53e0da1f6b756f0d4c55cf022</md5file>
-<md5file name="zh.js">08a8916335ace5bb4b9805d1e0b5e8fe</md5file>
-<md5file name="fa.js">bff0ad390064c7e2b31462f7ddbc3f88</md5file>
-<md5file name="ca.js">7cc05403e345ccb5e96f61d7fb36830f</md5file>
-<md5file name="pt.js">53fe627e8236690664d6028a094d4ae1</md5file>
-<md5file name="el.js">8debd5c821e24b704f66f0a10b4e2e6b</md5file>
-<md5file name="et.js">fa411083fb752aa47a0245c18e4ccfe2</md5file>
-<md5file name="nl.js">94161501225717d85d7af627537051dc</md5file>
-<md5file name="gl.js">4d1c5569f6eecc77b5fd1f5ad572809a</md5file>
-<md5file name="he.js">3148092fecba9ead1ca889d868fa02b0</md5file>
-<md5file name="ro.js">af3ca2bf26f0465023bfd82c10ceed89</md5file>
-<md5file name="sr.js">524ddf7870ecd5c6fe899640bbac2029</md5file>
-<md5file name="gu.js">1ea16ffec75ea17ba8ad18b473a796fa</md5file>
-<md5file name="bn.js">a7804359a276810cab36d93aaeb215bc</md5file>
-<md5file name="eo.js">e624f3976c3f5d726a8353432a0c04c5</md5file>
-<md5file name="hi.js">a7541c8b7e02be34e75512b856fa1ec2</md5file>
-<md5file name="no.js">aa68d711d69293957a9d69db1c22f3be</md5file>
-<md5file name="eu.js">fe59a2b5f8216e2b157a6212f00bcede</md5file>
-<md5file name="uk.js">65501c86d18f49ebf32bc3c0fd47e062</md5file>
-<md5file name="hr.js">d2f253d3da990772bb926b6012bfc18d</md5file>
-<md5file name="pt-br.js">bc5dd6a30e2267713c4098bcc4f45f4a</md5file>
-<md5file name="de.js">79ef0811865c309f1565784a027c32ae</md5file>
-<md5file name="mn.js">946892a6b29f610bc2f7cf99907fd673</md5file>
-<md5file name="sq.js">b40fa1136de474a69e6d4915f9b2a80c</md5file>
-<md5file name="ko.js">cc8c47d1fa6dc294be5701efd1dd591d</md5file>
-<md5file name="is.js">5ec51fdbf3e58f8b64eaa81989c45271</md5file>
-<md5file name="it.js">880f18b929ba47f3eecc446da05e63f0</md5file>
-<md5file name="th.js">aaf1d42d655eb5d01f0c50c071989e5a</md5file>
-<md5file name="id.js">c892f44e925b21a4d6fb5ac6d22e6a85</md5file>
-<md5file name="nb.js">0030a0fa29b1ca57e61e6ac61e0674d2</md5file>
-<md5file name="ja.js">6083f371e6147be632379528b0e47a4b</md5file>
-<md5file name="pl.js">94bd08b7859e9bb2140e6b70cb4a1ac8</md5file>
-<md5file name="ku.js">eac379790742d4618280407a55ef80f0</md5file>
-<md5file name="cy.js">84d768fe278aa3543546547897608946</md5file>
-<md5file name="hu.js">90f6dab5e408048c9bccc711302eb9a7</md5file>
-<md5file name="ka.js">789b2d89b82a91a1af067b9d83442f03</md5file>
-<md5file name="da.js">609b886e7db3455e35fa3345a5f5ae5a</md5file>
-<md5file name="mk.js">a669661b6cffcb1f6c6968250494896b</md5file>
-<md5file name="sv.js">15a2d96bc1446cd93b5255d9e3b635ab</md5file>
-<md5file name="lt.js">29cae020df4221ec9a54a36e438be517</md5file>
-<md5file name="ru.js">bf69258cea05265f4726b82ce0cf7438</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak/images" >
-<md5file name="pagebreak.gif">59caae8ab95b2eeba9444ba219446c75</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pagebreak" >
-<md5file name="plugin.js">d23aac026cedcbfd9ac907d8b381c409</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/removeformat/icons" >
-<md5file name="removeformat.png">f07c4c80135c24e1767c97e892dd91d1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/removeformat/icons/hidpi" >
-<md5file name="removeformat.png">09d96357be13183ecebe78a78594bae3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/removeformat/lang" >
-<md5file name="lv.js">7ab4facaf458a4151978751e427e09c8</md5file>
-<md5file name="cs.js">59b09897951b4ae8033095a679c7eaea</md5file>
-<md5file name="bg.js">fbabac0f628ea94dc81ce720ffe5b518</md5file>
-<md5file name="zh-cn.js">6b268a08ba04c73389cdbe40b43e02d6</md5file>
-<md5file name="km.js">a8f24c81d4356c863d0312fe22d60682</md5file>
-<md5file name="sk.js">5208c1dab4bd87a0ba9395e2053bbcb8</md5file>
-<md5file name="vi.js">dd7ace62fc1cf90e2f1aeb03140f332c</md5file>
-<md5file name="tr.js">b62adcce233f417c439a3582598599e4</md5file>
-<md5file name="sl.js">84f2c91ad62ba9a338031ede50f03a37</md5file>
-<md5file name="es.js">e1211327091a19c78aca0ea542a12bc6</md5file>
-<md5file name="si.js">4de94dd78abc3d9bc5770ef7c5869895</md5file>
-<md5file name="ms.js">e136cff7ab9e595bffb5a5b3d71bf6ba</md5file>
-<md5file name="fi.js">a1c69fd47e495a974e2b0f27d3e61cd7</md5file>
-<md5file name="en-gb.js">5a0fd20838f9ea420e236d2ac5fb0354</md5file>
-<md5file name="en-ca.js">fab94f16ec6471dd6edc07ffe1a3d92f</md5file>
-<md5file name="af.js">b99a13b28a4220b6d44e0dbb71e6453e</md5file>
-<md5file name="ug.js">e4bccb7903f9cc37f2a5b758a64bfeb9</md5file>
-<md5file name="fo.js">4faf9a59c65d3587e028e8f209231ca4</md5file>
-<md5file name="en-au.js">ad925e2851b226d2f976075a6ceeafda</md5file>
-<md5file name="fr-ca.js">910cd8728664a40c8fff90a42b329666</md5file>
-<md5file name="bs.js">4c71d865203bbed2c3e0cc613016ef16</md5file>
-<md5file name="ar.js">84c56529c746e9a255b446a856110eb8</md5file>
-<md5file name="en.js">4cc2ae9ff71559bbe8c3ec9c2e0b0db1</md5file>
-<md5file name="sr-latn.js">5c78c6047674bd80d65b295c9739443b</md5file>
-<md5file name="fr.js">5eba97b678bb765760b3083303750ebc</md5file>
-<md5file name="zh.js">4e0b2d6ad47a939cbd1aed18a3b18447</md5file>
-<md5file name="fa.js">1f0eff83daa5702fd156fc52633601f4</md5file>
-<md5file name="ca.js">8879893e08299e2cc3359a89b1be866b</md5file>
-<md5file name="pt.js">f78fa13842ee5d3d094c20ad6bad1f6a</md5file>
-<md5file name="el.js">c1f8a62dd7788a5d4993c3c38f28a459</md5file>
-<md5file name="et.js">bb260c3a099a844105d259dd4e43e7c7</md5file>
-<md5file name="nl.js">1a3460d32cada73ea61c05cdac89f199</md5file>
-<md5file name="gl.js">dba3d9b98aac5eedf4992a700ef43bb7</md5file>
-<md5file name="he.js">c61ff1e348b67b36a8448ee040797ef9</md5file>
-<md5file name="ro.js">accf7951f475a87a9467498d58f55b4b</md5file>
-<md5file name="sr.js">722fc583fcaf8aa04dced888396b46b5</md5file>
-<md5file name="gu.js">269421e00bca25d525a924b61dc183d8</md5file>
-<md5file name="bn.js">559df83e590334268ca422c4ba7ad261</md5file>
-<md5file name="eo.js">06eefb58b35916b5e82c8db0dd4f1e1a</md5file>
-<md5file name="hi.js">b68897e92e920881b26ba8cb8403c53c</md5file>
-<md5file name="no.js">549c90e46303cef910afd3d8af1be63e</md5file>
-<md5file name="eu.js">3b506686090dc9c874f243505121d0eb</md5file>
-<md5file name="uk.js">4c5566ae3f96d929ae07e8621c6001b6</md5file>
-<md5file name="hr.js">f76258d204bfd2affbf78c075f255959</md5file>
-<md5file name="pt-br.js">791609c6bc4281feba925b1d9ffc41bb</md5file>
-<md5file name="de.js">825a3df16f2c1ade9b9d3094417db9d0</md5file>
-<md5file name="mn.js">b3d67d0b1356d80f548c3c2f48bbd21d</md5file>
-<md5file name="sq.js">1365cb505cc38e32fb6e8c60c08a0b32</md5file>
-<md5file name="ko.js">abde8f135963a84439d39f6cef3342bb</md5file>
-<md5file name="is.js">1f8918e682f9da7d37aa17e94017384a</md5file>
-<md5file name="it.js">3d6c8535c245323350a1bb1addd80283</md5file>
-<md5file name="th.js">5b717e20cad8756656a51b7d8f0e2815</md5file>
-<md5file name="id.js">ec0d0db678292150c81c5cb6efdd9124</md5file>
-<md5file name="nb.js">166e20952300293e9b6c8fa8c48b3235</md5file>
-<md5file name="ja.js">bd00db7de155418fde890169f111ba0d</md5file>
-<md5file name="pl.js">bf802d3ce72fea135d916e6beb47550f</md5file>
-<md5file name="ku.js">1bcfd3cea96c9ac5adb052f67a1d3468</md5file>
-<md5file name="cy.js">b97a4d30e31f0da9a172d5c3420f77d4</md5file>
-<md5file name="hu.js">cc9edb760200803033e74b717665ca51</md5file>
-<md5file name="ka.js">5e511d66b4ef4b960e7c0088137ba5da</md5file>
-<md5file name="da.js">2d8ea15d9cd527c9b6e940befa77a69f</md5file>
-<md5file name="mk.js">a0626961fb2ee10b5372dc79428615c8</md5file>
-<md5file name="sv.js">868628aced072c27c25684f70bca43c0</md5file>
-<md5file name="lt.js">a51873ca0099f6148114532d9d56ed81</md5file>
-<md5file name="ru.js">6fcf5f47fbe7ebcddec5f6ae0e712fe4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/removeformat" >
-<md5file name="plugin.js">e88cb5ee4055519600dcfd7a4bfb45cc</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/dialogui" >
-<md5file name="plugin.js">03afb32f7ff3e1eb0d61cf619dda3895</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/menu" >
-<md5file name="plugin.js">9fdf0ee74a688f3e884f9e5ab927f198</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/popup" >
-<md5file name="plugin.js">3f8d8e5cf37f5bb6190a6fd44d3bbef6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find/icons" >
-<md5file name="find.png">08e157806b9d8deceea99c99f1f63c1a</md5file>
-<md5file name="find-rtl.png">08e157806b9d8deceea99c99f1f63c1a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find/icons/hidpi" >
-<md5file name="find.png">97eb305e815b69a291d4cb1f59896b68</md5file>
-<md5file name="find-rtl.png">97eb305e815b69a291d4cb1f59896b68</md5file>
-<md5file name="replace.png">81c71033f134ccbe045fdb1712bb6eb1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find/icons" >
-<md5file name="replace.png">5c4a2600c7b5e80fed83112a6a594d4a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find/lang" >
-<md5file name="lv.js">e900b5594bb0527f300f97e06c187384</md5file>
-<md5file name="cs.js">9c737c70861de22fd0e3f03393808520</md5file>
-<md5file name="bg.js">3b4dda2859c74f4bfdabb95492dd9280</md5file>
-<md5file name="zh-cn.js">cddfcc06e590e90644d3d3e33b3f034e</md5file>
-<md5file name="km.js">d00ff3e12914fdfa24e295270d70a749</md5file>
-<md5file name="sk.js">007ad466b9de8d487aa4031316141e1d</md5file>
-<md5file name="vi.js">a29b9d99adde2ba2909b6f94b14d74f7</md5file>
-<md5file name="tr.js">426b43afe9927fd220415b0afa68679a</md5file>
-<md5file name="sl.js">ab11f34bd4155be2ec424adf7cee7d3a</md5file>
-<md5file name="es.js">0ee913e0599e8600eaea6ff34035af13</md5file>
-<md5file name="si.js">b48112fecbb1cf9b8f59a18dec1fa552</md5file>
-<md5file name="ms.js">ed91c73f2ac84ce445e2a0e8fbd36743</md5file>
-<md5file name="fi.js">f95fe28a5aa8a210a900cd6ea52b67a8</md5file>
-<md5file name="en-gb.js">42ff4c35d96bf751db1202cb0f89a236</md5file>
-<md5file name="en-ca.js">31f7ae6a20c4f0c4ae09f09c123d63f5</md5file>
-<md5file name="af.js">c85a6538545fe3184cb1df6239850f9d</md5file>
-<md5file name="ug.js">2dee15542d8f9756bff59c4c511bb5cc</md5file>
-<md5file name="fo.js">756af74d72e5f473bcf7ee412df4748e</md5file>
-<md5file name="en-au.js">17e5efc6d1001460f09128243797d159</md5file>
-<md5file name="fr-ca.js">b1c2b62786638489504669075cf6b27c</md5file>
-<md5file name="bs.js">135cdbde7d4014af5d8a53941e022bde</md5file>
-<md5file name="ar.js">b7f4e2eb0261882d091d08d5112317b9</md5file>
-<md5file name="en.js">3526122cbc319aaab506326e9730d80e</md5file>
-<md5file name="sr-latn.js">ca41301b89d8410100e0a0c288ccf977</md5file>
-<md5file name="fr.js">ded46de770d90adb4156d71e1502fdce</md5file>
-<md5file name="zh.js">fa73136cfbdfc9a98fc14cc0b60f287f</md5file>
-<md5file name="fa.js">f2461e9e90ba08a3bff9224c58923254</md5file>
-<md5file name="ca.js">24c027a7a399d696469b17caa87c80a4</md5file>
-<md5file name="pt.js">b8cc34ce3dde40ee25ff9883c78ec9f1</md5file>
-<md5file name="el.js">88bb1d27e679bfa171113a1c69a078ed</md5file>
-<md5file name="et.js">4c82d9f492c61232fa53c199d1fc3934</md5file>
-<md5file name="nl.js">38e93f63a3878a77e0e9ffc271c09fc5</md5file>
-<md5file name="gl.js">be03e591ed45adf75b4bc882e991572b</md5file>
-<md5file name="he.js">dbc9531550440dcd06127ad3effc4a77</md5file>
-<md5file name="ro.js">2aa4dc4d5f969a199fcad338789a8ff5</md5file>
-<md5file name="sr.js">4ebd5489630d7789a317438425c08280</md5file>
-<md5file name="gu.js">1217616f0fc32f54deb52ff1e512ebde</md5file>
-<md5file name="bn.js">8e9151bd050cd64a2de231ece857333c</md5file>
-<md5file name="eo.js">c08f2440712c7c5504bcf5e4effcfc42</md5file>
-<md5file name="hi.js">b1052ffcd0411db4d2d7de9171dd1626</md5file>
-<md5file name="no.js">d4ed67350cd0982247ca9d3e0f382c5d</md5file>
-<md5file name="eu.js">7ae5fd6013f4e76bfd2b8f43b6366044</md5file>
-<md5file name="uk.js">79e08909b35f69f1ceb781254f2c607a</md5file>
-<md5file name="hr.js">fce9852f312c03cadfa20b70ee7ca8ee</md5file>
-<md5file name="pt-br.js">3fc438d7b9078e8a825ffad968364f0e</md5file>
-<md5file name="de.js">61ea0d9489ecaf2f41988a00f3cbd9b3</md5file>
-<md5file name="mn.js">ba37b327f20d13a6381021aa9c4884e4</md5file>
-<md5file name="sq.js">cfa52487e324db96d0f065e1ee40bccf</md5file>
-<md5file name="ko.js">231416aaed1db74048f5042045f82ecb</md5file>
-<md5file name="is.js">e7a7ffc954bd797c1fa91de37ad284e9</md5file>
-<md5file name="it.js">4580c046af8c3d573c7fdc41b8315fd2</md5file>
-<md5file name="th.js">0ce34481c49596f91a1ba6adf7e9b1e5</md5file>
-<md5file name="id.js">298deec06a5177e42ed9f206a84dbf8f</md5file>
-<md5file name="nb.js">e33c94dedbc1d4f8d67fd6e840addb0f</md5file>
-<md5file name="ja.js">d9b9888e1625142da3eb8731a964a36f</md5file>
-<md5file name="pl.js">d11ce33f08a9512a484a123640c5b5ae</md5file>
-<md5file name="ku.js">78abe963b940659c36e476174487e8b3</md5file>
-<md5file name="cy.js">c4ce5c5861b21fbd5f931d2b446ae4a0</md5file>
-<md5file name="hu.js">3aec21be1a3d90b65fe4b8e29b0f1f03</md5file>
-<md5file name="ka.js">b9e622859e98fcf8fb44f7226aaf16a1</md5file>
-<md5file name="da.js">758369d0784d0502680cd28c4966ca61</md5file>
-<md5file name="mk.js">e85575ae819585f25a8e7beb4bd86d00</md5file>
-<md5file name="sv.js">4df0a837930869243f02395fb75ad97d</md5file>
-<md5file name="lt.js">79f403eec1d865029f24b8c32978e6e3</md5file>
-<md5file name="ru.js">b7ec82f70319afcec7e1c61084106286</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find/dialogs" >
-<md5file name="find.js">78a50a94432d86044f05c1a287b9c071</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/find" >
-<md5file name="plugin.js">cf2a58dbf1d1b58a5cf40a053b23fd3b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/blockquote/icons/hidpi" >
-<md5file name="blockquote.png">a9db294fbbbc538ff69acd16bcde77ed</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/blockquote/icons" >
-<md5file name="blockquote.png">47f605252aadd95c22ed142487fda3e7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/blockquote/lang" >
-<md5file name="lv.js">030248e13d61044617b36ca9258f0f53</md5file>
-<md5file name="cs.js">18bd2fdf15e5ec00f94519e5209ef0e4</md5file>
-<md5file name="bg.js">9ab450d8da00188c33ea6825c0f9709f</md5file>
-<md5file name="zh-cn.js">4034e1ac9e465861e63834c81d25a9c0</md5file>
-<md5file name="km.js">983176b7f9a38f2275ef35074adfb5f8</md5file>
-<md5file name="sk.js">19683d962a67840e10fd8d271249d4d6</md5file>
-<md5file name="vi.js">c772ea24f117d1f1ae698f9465096330</md5file>
-<md5file name="tr.js">fc3fdd0cc9040c14b18c9e6481c07308</md5file>
-<md5file name="sl.js">b190e581221f6047139c48495ebeeee8</md5file>
-<md5file name="es.js">7cebeda4fde32a8b9122e600898a4f27</md5file>
-<md5file name="si.js">583da2de81547e5be899003c87f014fa</md5file>
-<md5file name="ms.js">f0b9c426b53cae801ca7ab42d177e054</md5file>
-<md5file name="fi.js">94f01242b07d2f8dd29b2e92717bdea1</md5file>
-<md5file name="en-gb.js">082aec1700e31d4aa0757c90bbff0fef</md5file>
-<md5file name="en-ca.js">a278f525013fe44144bfb76f9ccd641c</md5file>
-<md5file name="af.js">5c62739ccd5a7703ea322654c547b828</md5file>
-<md5file name="ug.js">97aa4dcdb5e27a85ca72cd7b5643d898</md5file>
-<md5file name="fo.js">992cd98766048aa3d405082a639a43ef</md5file>
-<md5file name="en-au.js">ca90a99c6e63f993b11bb52b5252686f</md5file>
-<md5file name="fr-ca.js">5c5dae956041d12cd573c0772fff75df</md5file>
-<md5file name="bs.js">45b0f1a4f0d307ee461daab3e053d1c3</md5file>
-<md5file name="ar.js">2d2aa3b671e422ad187b8853e4b8a663</md5file>
-<md5file name="en.js">2ae2f8de46573581587b3de66f31ef91</md5file>
-<md5file name="sr-latn.js">3470a858bb82cab07c13cb8da67331b6</md5file>
-<md5file name="fr.js">a6316fbaf0b2fc38b90c5d8129e26585</md5file>
-<md5file name="zh.js">cbdfb8bccf81c07de980f3858e8e8de3</md5file>
-<md5file name="fa.js">f4d1dcbc3360000d88060e8673191fdd</md5file>
-<md5file name="ca.js">1177ccafd6fb5aa04c46267b1d9d57da</md5file>
-<md5file name="pt.js">8ef83741c8ac64ad956e4dfce8cac46c</md5file>
-<md5file name="el.js">1ca687ead00d32ac93356c70d0228ffd</md5file>
-<md5file name="et.js">43def4256809d3b496c5eaa92355b21f</md5file>
-<md5file name="nl.js">4dd56c9562abd48648ce1b2b01228ced</md5file>
-<md5file name="gl.js">c2fe480cbe6df6aa629f79205abf89ba</md5file>
-<md5file name="he.js">cef772a0f10113e3ef7a4854468d6158</md5file>
-<md5file name="ro.js">6f4ba2870ce64b0bcd7860f07b973b45</md5file>
-<md5file name="sr.js">60aa29a1d281796d255d19faf9463054</md5file>
-<md5file name="gu.js">d44bf025db4cf0641339b169a3026bc7</md5file>
-<md5file name="bn.js">01d72c29793cc7a5002a9a62dc44c216</md5file>
-<md5file name="eo.js">d0843e2cb2d7e1b2a5e0196105f5f070</md5file>
-<md5file name="hi.js">5d8ca0b11276d0a1eacb6450b0cd08e9</md5file>
-<md5file name="no.js">20ca93c037764476146e9c796578136b</md5file>
-<md5file name="eu.js">2fd82abbbebc9d5522dc7a30a9cc48ba</md5file>
-<md5file name="uk.js">d0b080b2b4cfb85b9b477ea971f46cbf</md5file>
-<md5file name="hr.js">a24a6c90c177a114c8ab214f43db7227</md5file>
-<md5file name="pt-br.js">e72b0a117ab12047daf8d764b09d7351</md5file>
-<md5file name="de.js">5a4c29b8a92a8cbf912ceed74f841f3f</md5file>
-<md5file name="mn.js">0421ee072598da0de952f933934f78a4</md5file>
-<md5file name="sq.js">4df3f182d365fb49852aa6273624550b</md5file>
-<md5file name="ko.js">0b53b51d64ab737e7d26622301c0b4e6</md5file>
-<md5file name="is.js">b004ca49e480496fcb1eb2d2265d9f96</md5file>
-<md5file name="it.js">00561b49649191b0a71485544966de56</md5file>
-<md5file name="th.js">1c6762de88604a103c1b58fb1a662abc</md5file>
-<md5file name="id.js">25e9da32e0d667a6ba31cb66ab137ead</md5file>
-<md5file name="nb.js">e33dbf7e21300e1982478524e3328d47</md5file>
-<md5file name="ja.js">467a15fbd135255d8b985d7f7128c0df</md5file>
-<md5file name="pl.js">ef0f2197c4ed9038bd237e51c1119083</md5file>
-<md5file name="ku.js">55bf774a83d9f08bff1982bcff33c58f</md5file>
-<md5file name="cy.js">65ab78bb8d883c44f7bf266727b01154</md5file>
-<md5file name="hu.js">cd691dcd5065f061270d8aef246d9926</md5file>
-<md5file name="ka.js">6371a45ca52232c3c7fe46c3fd46ed82</md5file>
-<md5file name="da.js">4a74c457308e13e3c87fb50bc2aff7c0</md5file>
-<md5file name="mk.js">ae64505398e6f6127250864b1d4595b3</md5file>
-<md5file name="sv.js">85373c1eab9eafb64dd708e57a9652c6</md5file>
-<md5file name="lt.js">d9ce94791fae3da15baf022e148f1e4c</md5file>
-<md5file name="ru.js">d8ea9bc8825d21950867672bf140f0b7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/blockquote" >
-<md5file name="plugin.js">721ef95b0094678f4649627ae2a59ec4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar/icons/hidpi" >
-<md5file name="specialchar.png">accab4230d9411331e5301630048a5e2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar/icons" >
-<md5file name="specialchar.png">ffc48f1ffde7924a1adc4be3e85f96bf</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar/lang" >
-<md5file name="lv.js">c9f3e02069c982036e19fdbad60a3c82</md5file>
-<md5file name="cs.js">2e00151a478a8d5898bbd3b486a2a3d4</md5file>
-<md5file name="bg.js">5463f954c60ef565e2982a8f60c940af</md5file>
-<md5file name="zh-cn.js">fa5aeff24e2b1e646f01f9219e1f4b31</md5file>
-<md5file name="km.js">1d61871a075da69fb6a66ca0870a6e5b</md5file>
-<md5file name="sk.js">7c09b1415801cd7a2d1fc6bf3122c182</md5file>
-<md5file name="vi.js">f9f216704c893ad5fad21cf6887e312b</md5file>
-<md5file name="tr.js">6ff23c9054f454cf05da98f8be975a83</md5file>
-<md5file name="sl.js">81ad2c14e9462f7a94c2d44459d51246</md5file>
-<md5file name="es.js">c7245b45878f02ef6de41582fb9270f6</md5file>
-<md5file name="si.js">d16c6bf5384fd64e9a2c9514bd9e39ff</md5file>
-<md5file name="ms.js">a298abf1d5f956a39f1c07a8c606e862</md5file>
-<md5file name="fi.js">2241c36d8f39f9d45bb94662de5007af</md5file>
-<md5file name="en-gb.js">f5afbbec7c0c4043ed0ce255c3801fc0</md5file>
-<md5file name="en-ca.js">fa798861376bfa8c7e9b814fabb27af0</md5file>
-<md5file name="af.js">49aa5f83f36bb1b67a3178a095a522a4</md5file>
-<md5file name="ug.js">619a4182d7f8ae40abaa0ad405aa79e6</md5file>
-<md5file name="fo.js">6fb13b77dc08c87950f0b064f8ebee8b</md5file>
-<md5file name="en-au.js">e91392ba55c589df3f6e9d235c148a47</md5file>
-<md5file name="fr-ca.js">87ba4660955ed43c76a894ebae23f41a</md5file>
-<md5file name="bs.js">34ddb664d0ab4de2050f93ae3dfd4d37</md5file>
-<md5file name="ar.js">ad7355ee1a27a92d56f0ea3d0528210a</md5file>
-<md5file name="en.js">61a69f52f637ee714fecc4c723bfb9c5</md5file>
-<md5file name="sr-latn.js">956293d2ad25f84ab223b5f53cef2390</md5file>
-<md5file name="fr.js">a7de96e55db2eb0a7cbc4226c5763546</md5file>
-<md5file name="zh.js">fe9f4ccbbc7951fc61fbc94ab3092a6e</md5file>
-<md5file name="fa.js">97a29a9a109bf806f2ccb930cf097ada</md5file>
-<md5file name="ca.js">20a0cf537a7a61809d6f0ab25520c302</md5file>
-<md5file name="pt.js">3907cc81fb7e7fcce1a94f0bbb51d3af</md5file>
-<md5file name="el.js">210fb494a11fab76614fbf5d08881a77</md5file>
-<md5file name="et.js">56bde2dff60059cacc95e478fad11c1d</md5file>
-<md5file name="nl.js">686084517ffd9057809a0ccf25838f9c</md5file>
-<md5file name="gl.js">6673dcc97bca838f5636c36369a77dc2</md5file>
-<md5file name="he.js">bae54fd8ece7a085248f4293767365ac</md5file>
-<md5file name="ro.js">06c3338556f7c625361fb1e60f2c64cd</md5file>
-<md5file name="sr.js">cf3016d2d8d477406c762d58dabbbbfe</md5file>
-<md5file name="gu.js">51ff71dada11446c64b27c892326a87c</md5file>
-<md5file name="bn.js">1013b203fd0e4c2da6853f781df70a18</md5file>
-<md5file name="eo.js">5c25d9aabd6aaa2a4bf443c7008bff64</md5file>
-<md5file name="hi.js">d2ed3c4af62db9cf4b48802b67ab6468</md5file>
-<md5file name="no.js">63610106f8fbf5414802aea71cc4a4e9</md5file>
-<md5file name="eu.js">6d458a1f1acd9ee6f92c450923910cf8</md5file>
-<md5file name="uk.js">4ff541158352d4ababb236a6aa5e9061</md5file>
-<md5file name="hr.js">30975da6c7fa7b556ac2ad20eaca5dae</md5file>
-<md5file name="pt-br.js">a7a7914e881b57a69ee3ee50ba4f39a4</md5file>
-<md5file name="de.js">89461c2afdbe30e1b5d1db586e06652f</md5file>
-<md5file name="mn.js">0b5718ac6b1f7dedca8615f9811e2ae2</md5file>
-<md5file name="sq.js">a5d6f963b9fafbb25bf11297cfb90a2e</md5file>
-<md5file name="ko.js">542d2f2ac444fa694049230e4b50dad7</md5file>
-<md5file name="is.js">3f8bb8d347a12d31ddd9c44a334e0084</md5file>
-<md5file name="it.js">ee20b0b1a78fe03948ee53587a24c396</md5file>
-<md5file name="th.js">35f19f9f71f3e9803a5e5af22fabdaca</md5file>
-<md5file name="id.js">2c53c5efbd7464c95db97e373d7ea35c</md5file>
-<md5file name="nb.js">5bfd0c6631b801853e954756e42de150</md5file>
-<md5file name="ja.js">b7a418a6de870057dff3eb1d077b2e52</md5file>
-<md5file name="pl.js">6d847079cc77cf103dd4277e9d4fdae5</md5file>
-<md5file name="ku.js">22e9eca179b58a57467cff5659b36b8f</md5file>
-<md5file name="cy.js">bf9a7425668bde0c9027556ededbd7a2</md5file>
-<md5file name="hu.js">30bd33dd5867bca8ae4b7c03363db4f6</md5file>
-<md5file name="ka.js">794201010c95f1c43d6ca4c5160673de</md5file>
-<md5file name="da.js">fb4971d46e41755e42348220576845fa</md5file>
-<md5file name="mk.js">4298c4c0ef40f1d5c051356f1b2a17ef</md5file>
-<md5file name="sv.js">b112314c309eacbb45235456b3fe3e71</md5file>
-<md5file name="lt.js">0349dfde60d4f7ea1676e23b85c2e911</md5file>
-<md5file name="ru.js">5fbe153aece58eab309ddd19226e3f92</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar/dialogs" >
-<md5file name="specialchar.js">bf5dc59bca9bc1f7793d6893040eb9ce</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar/dialogs/lang" >
-<md5file name="lv.js">6f7bdb6a244ea8a1a51a271be1641487</md5file>
-<md5file name="cs.js">a92e2573661f4989a4dd972f58345a58</md5file>
-<md5file name="bg.js">af13d14c1fc24dd90412b33e20e42a13</md5file>
-<md5file name="zh-cn.js">9c1afded1ce7798b1cd6ca4cc61dfae4</md5file>
-<md5file name="km.js">7be86c67bf8f88d06e5b6ce754c5a18a</md5file>
-<md5file name="sk.js">5737cd18191c5c11ece98fad73482125</md5file>
-<md5file name="vi.js">68fed2691e16e97938c695ba009ec514</md5file>
-<md5file name="tr.js">af58c45143890421c6c0c84cf513540e</md5file>
-<md5file name="sl.js">58b24de5b00796597ec404cb95bc84a5</md5file>
-<md5file name="es.js">874ef15719b219c69477988f8dfbc3b8</md5file>
-<md5file name="si.js">bd10043cf4f91c6931fd27868223c530</md5file>
-<md5file name="fi.js">cf67c993408f4d06b374ba9a4ffbd21e</md5file>
-<md5file name="en-gb.js">15e02ff036a1f2aad1788996d094996f</md5file>
-<md5file name="ug.js">4768144a2156d01dad0df8b0ac120095</md5file>
-<md5file name="fr-ca.js">91ab4e09bf3f12e32a2bd18c0f1c7e66</md5file>
-<md5file name="ar.js">33296b9bf12e7de6dd8eff02809e05e2</md5file>
-<md5file name="en.js">08b9a65ed172b1392385a25d673616d4</md5file>
-<md5file name="fr.js">108062868b30a4df24a6ab2ca90b56f2</md5file>
-<md5file name="zh.js">95e800bc5cbe3202cfe41b1b17c7022f</md5file>
-<md5file name="fa.js">62957579a880b5603f9c32a50bdb14ce</md5file>
-<md5file name="ca.js">14df362aadc8a850e182698367819d98</md5file>
-<md5file name="pt.js">a459d5984067d8da16a7d47f35c67b8f</md5file>
-<md5file name="el.js">a2794fb493f5cab0a1c1b4bce6ebef46</md5file>
-<md5file name="et.js">819a0a3761a90a651ec448a1aaa1a630</md5file>
-<md5file name="nl.js">3a4bdfedca9792320466e9c0fed58c05</md5file>
-<md5file name="gl.js">a03c188d2d679b98a79a82b0342614e8</md5file>
-<md5file name="he.js">8e0e256003a8d1dec7a5ac13a7ae304d</md5file>
-<md5file name="eo.js">fc13f9688977fc797a256646faffa866</md5file>
-<md5file name="no.js">2e7dd26b014e5b72329ec8f6ed9975ca</md5file>
-<md5file name="uk.js">2a3671ea78a3a7b4f1946625737235be</md5file>
-<md5file name="hr.js">12f0382bcb4cd8d6c8a4aab117c09350</md5file>
-<md5file name="pt-br.js">d8a6028a77d0aa2a08894e4749a03428</md5file>
-<md5file name="de.js">92d44534a8292ad7002070c4a999c90c</md5file>
-<md5file name="sq.js">dbdabc48188f62860eadcb1aede7f6f7</md5file>
-<md5file name="it.js">6f920dc7718dbcebc8bfcd967e8ae326</md5file>
-<md5file name="th.js">32e573b584637f2ef0e4e6c6c9c30aaa</md5file>
-<md5file name="id.js">e9427a836bdbdce255e9134de57484e8</md5file>
-<md5file name="nb.js">1643b60ba6afede59477f1725a65aaa2</md5file>
-<md5file name="ja.js">08c0505df349f5ff61e7fbc57aeb34aa</md5file>
-<md5file name="pl.js">a5cc8e70457f127f77765c2d77644e21</md5file>
-<md5file name="ku.js">c01a8e77be74f42d89f956540b2dd8f0</md5file>
-<md5file name="cy.js">b0c392b0be31f2861ad74e2f4a5d1c49</md5file>
-<md5file name="hu.js">fbf62cf8cddb04f96617c487b097cfe3</md5file>
-<md5file name="sv.js">3e6cfd8c21d6a8ad1022a3883a0db65a</md5file>
-<md5file name="ru.js">2c862aa33e458ad30001166581f0eb07</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/specialchar" >
-<md5file name="plugin.js">f4c5e92cfd800f12aa1650424fe5674a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline/samples" >
-<md5file name="magicline.html">fcac34b6eefc89912ab4a9ad63e4d1dd</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline/lang" >
-<md5file name="lv.js">9ca4eac488b90f3a72d3ae5e09ba7350</md5file>
-<md5file name="cs.js">e622810a8a875363e00f5a020051837b</md5file>
-<md5file name="bg.js">69d62596107f4be1d2b435856c56582f</md5file>
-<md5file name="zh-cn.js">03c7c5297a51dcbe13f88cf72e010740</md5file>
-<md5file name="km.js">a9fb0f1230286144a33fca5a1a141fcd</md5file>
-<md5file name="sk.js">807822cc53f25e63e2e3ab54a4eef2d0</md5file>
-<md5file name="vi.js">07633bb947e7004df22a1d4b59179644</md5file>
-<md5file name="tr.js">c956d479542d9762707617ab46283e94</md5file>
-<md5file name="sl.js">f087349a358e5cfe09b9904ba75f7b96</md5file>
-<md5file name="es.js">c7b669a5bc86de8f785342c666ef1a0c</md5file>
-<md5file name="si.js">a80b57f06217aa2116cc67cd53f6bff4</md5file>
-<md5file name="fi.js">4e96ccaaa0f067c0d849d0face6a5bd1</md5file>
-<md5file name="en-gb.js">600beef9a502a6ae30698365fb805257</md5file>
-<md5file name="ug.js">c3c3ba226a9acb79b05712726b6ab3d7</md5file>
-<md5file name="fr-ca.js">02dde6e74ea514cb0da1612219cf0564</md5file>
-<md5file name="ar.js">d37340d5af6d82bb1a77a34d13c7197c</md5file>
-<md5file name="en.js">a4b95999f598abaa2735d67eca2b5a86</md5file>
-<md5file name="fr.js">4ed5332265904758626a4377406acdf1</md5file>
-<md5file name="zh.js">28640ff5a9b34be5798de29104f10709</md5file>
-<md5file name="fa.js">c2868310d29e3b390fdc6c7453f4e222</md5file>
-<md5file name="ca.js">e641dac10a7da90286a2f36f99efec59</md5file>
-<md5file name="pt.js">8e1cb6be2143e1d41d29e97d5aeea8d1</md5file>
-<md5file name="el.js">ac9abd799f64b2ec55406c26da23bb55</md5file>
-<md5file name="et.js">950d2c68708d84790cc279a62f0b1135</md5file>
-<md5file name="nl.js">0f42549d7a1c92aacf4ac0d3fdd18a25</md5file>
-<md5file name="gl.js">575c8f0b0a3052d9f993139374d50acb</md5file>
-<md5file name="he.js">a23d826c38c1829a2b4911d452244c1f</md5file>
-<md5file name="eo.js">402031221b6a5aafcba9c1f028f2aba9</md5file>
-<md5file name="no.js">506ecd48c4eb7b26a27f25146983b6da</md5file>
-<md5file name="eu.js">78c9cef5e3c130487178275af3eb12ee</md5file>
-<md5file name="uk.js">2b843f296f68153a645a90e297180a85</md5file>
-<md5file name="hr.js">c1057178c24b2f34816c5830dfbbc730</md5file>
-<md5file name="pt-br.js">026a3b563a858ecd4c8441feb88aa332</md5file>
-<md5file name="de.js">10892847c57ac4058eb41a7699d333c2</md5file>
-<md5file name="sq.js">b560d8814737ffc35d0d250d07e3aa4d</md5file>
-<md5file name="ko.js">949665e8322fd9fed753cd9243e16e09</md5file>
-<md5file name="it.js">29278f465cbc15084b428ed2c7cb87b3</md5file>
-<md5file name="id.js">0ff07e35235504d0f3b06105afab6922</md5file>
-<md5file name="nb.js">409a6cd22ff78013b3d29080f1a165a9</md5file>
-<md5file name="ja.js">d8304fe1ad07e1c3da0d2ad88530f921</md5file>
-<md5file name="pl.js">a183f48bee470bdb205c3328c5372a9f</md5file>
-<md5file name="ku.js">11030fbdd985c52ff97b2295a2dd8d22</md5file>
-<md5file name="cy.js">85501e3ec766837f57886c9c0f04d010</md5file>
-<md5file name="hu.js">2a22876139cb9189d8c27a18e1a243d7</md5file>
-<md5file name="sv.js">f485cde96f056c42868745ba54a744f8</md5file>
-<md5file name="ru.js">8b33d7da529c59b8564d7d40fb9c262a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline/images/hidpi" >
-<md5file name="icon.png">befacdcc4c5bf6a333b8c82fbebe282c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline/images" >
-<md5file name="icon.png">278509efbcd2e9f657549d42026b8bf5</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline/dev" >
-<md5file name="magicline.html">14e21c3045d6d3010e816af81d7c7280</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/magicline" >
-<md5file name="plugin.js">c3e3c06d870a13664c24c1e574991f51</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/entities" >
-<md5file name="plugin.js">6405ccd00a5c2c81221b82a9a6fbdbf7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/sourcearea/icons" >
-<md5file name="source-rtl.png">b6d7bf775170c096cec0c3008cfafe75</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/sourcearea/icons/hidpi" >
-<md5file name="source-rtl.png">5e3a2c9ca377739914e8ae68a20bc04f</md5file>
-<md5file name="source.png">31fd312485aecf39ca856829e83ce728</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/sourcearea/icons" >
-<md5file name="source.png">a58e595ddf165baa3098f33784833dab</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/sourcearea/lang" >
-<md5file name="lv.js">8e51715957cebe1a603da9ef05daa521</md5file>
-<md5file name="cs.js">674204d15d22befafdd4358e070c87a6</md5file>
-<md5file name="bg.js">a7e69e437e2201a4729b3addad008453</md5file>
-<md5file name="zh-cn.js">b6390a186a02babb56fd815543f36918</md5file>
-<md5file name="km.js">3b3c3843adecf1550c725cc6eb788885</md5file>
-<md5file name="sk.js">e2556816007e8b2bc69c0464eead55d6</md5file>
-<md5file name="vi.js">4e3172d169f123f2ed42e6457098e352</md5file>
-<md5file name="tr.js">74b7bc756d82755bfc722244ba59c85b</md5file>
-<md5file name="sl.js">f4318b158b63b42f8e9e559df9aa9895</md5file>
-<md5file name="es.js">389f2ea1704535252b2ebda860943187</md5file>
-<md5file name="si.js">9f7faf573ab7aee8a85091f8141d48cd</md5file>
-<md5file name="ms.js">65855a76e55303a76c6f0be1fa835a19</md5file>
-<md5file name="fi.js">21a632653af19eaa8070fdd6176b5d11</md5file>
-<md5file name="en-gb.js">da3a7f1f22d8e177fd667b744d25d4fd</md5file>
-<md5file name="en-ca.js">1052f1d14c1ed7000296df653c8754fc</md5file>
-<md5file name="af.js">ff352494114e6def4abb66e0a60c73fa</md5file>
-<md5file name="ug.js">39ef21fca72b05149d766b6559ffe2e7</md5file>
-<md5file name="fo.js">3bd8da7cb54b869814e51db5cc9127b7</md5file>
-<md5file name="en-au.js">8a6725237e3a8f05d4aca9652f4e796c</md5file>
-<md5file name="fr-ca.js">eee10a1f140523369f5d61f48cde2abb</md5file>
-<md5file name="bs.js">b3184a5e6f07fe0d7db54f1ae98fe48d</md5file>
-<md5file name="ar.js">c16bd597445766f625bf05ba2b14079d</md5file>
-<md5file name="en.js">e225555211216fbba789e9b30ae7675e</md5file>
-<md5file name="sr-latn.js">01b0463a2f3d259b1a73405d14bae002</md5file>
-<md5file name="fr.js">815368e4e80aa28db96aa5ffa1bb9b25</md5file>
-<md5file name="zh.js">512a614742aeac612106b38f36830c1f</md5file>
-<md5file name="fa.js">63259862d9111982fc2bfdcbea692635</md5file>
-<md5file name="ca.js">a30f68bb98cdc06a4c9823a692295001</md5file>
-<md5file name="pt.js">5eb89aaee2713ad9c9ea914841863785</md5file>
-<md5file name="el.js">cf0308117211b637f65c28d27f4bdb2e</md5file>
-<md5file name="et.js">3b4b18d60044fe6bfbc33548d90d06c4</md5file>
-<md5file name="nl.js">53d7d7885ff03fe25ddcc30d60840525</md5file>
-<md5file name="gl.js">f9e4c2571171b37dba9e05f342b6dd6f</md5file>
-<md5file name="he.js">c3eac116d382d837c98ccab27f9f3a90</md5file>
-<md5file name="ro.js">c9b22172e811ed9b1640c3e3972bc2c1</md5file>
-<md5file name="sr.js">5bd595f803c08f5ec452e0e26b44c8d4</md5file>
-<md5file name="gu.js">3c98ba89d8b41bfeddb43d49851a6451</md5file>
-<md5file name="bn.js">bf7d2f0a171f6117848b160d845b65d1</md5file>
-<md5file name="eo.js">dcab548e1155b0c379dfda56b4178a6a</md5file>
-<md5file name="hi.js">b8067869917807971ab0c87cc12833ee</md5file>
-<md5file name="no.js">1d4d3c60401ae26ff1f010deb0f266aa</md5file>
-<md5file name="eu.js">d52137206851980ebe7a88360f7ebf72</md5file>
-<md5file name="uk.js">60b2e4d2a719eb487b456fcb66b8bda5</md5file>
-<md5file name="hr.js">4d043abdec007dd6218514286e048799</md5file>
-<md5file name="pt-br.js">0316e7a6684ca2c2f06c13c8ac15117a</md5file>
-<md5file name="de.js">4df2330346ff724461480ae6f292010e</md5file>
-<md5file name="mn.js">0b0eab64eaa80a0e96b09acd785a461f</md5file>
-<md5file name="sq.js">6ecf16935435936403cd8da4e38d6305</md5file>
-<md5file name="ko.js">74f6d5aaf64a6a3c76fa5eef1967eb60</md5file>
-<md5file name="is.js">2e818af7d25611b385c63d33d6685ff4</md5file>
-<md5file name="it.js">cf9010320d6a8427f2cebc5eb9ffe5f2</md5file>
-<md5file name="th.js">ea260364fcf259f67efc42b29919210d</md5file>
-<md5file name="id.js">03cf5413ba9eb436693ffa6ca8e80c58</md5file>
-<md5file name="nb.js">f10a00f26eb8bc8ef7de129bd482dc92</md5file>
-<md5file name="ja.js">dc8d46e6ea50a07791978c262648d00c</md5file>
-<md5file name="pl.js">645356825c05e2f24653dcd1d6ae5a6c</md5file>
-<md5file name="ku.js">2ea8c9e0cff569583b9f10139381c945</md5file>
-<md5file name="cy.js">d15d13a3ea77233149a91517227af14c</md5file>
-<md5file name="hu.js">bb5cc7a600501a46833bcbaea20d7a87</md5file>
-<md5file name="ka.js">804b5912e5eeb307632392aed646be82</md5file>
-<md5file name="da.js">a50933ec09dfd04403d15be88975d2e3</md5file>
-<md5file name="mk.js">1b344a5c954401e30c236c65e6f7de73</md5file>
-<md5file name="sv.js">6a0419c5a77c660861e642f6b23b466b</md5file>
-<md5file name="lt.js">c5277ee6b21bb7ecc094964daab552d2</md5file>
-<md5file name="ru.js">2a6a62fd49941a7165def6478109539e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/sourcearea" >
-<md5file name="plugin.js">628cf40a4ba7a223b5993c7994cf21b2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image/icons" >
-<md5file name="image.png">f63ef04a501398c9ea62416285a49ba3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image/icons/hidpi" >
-<md5file name="image.png">58e184b5c2e12e749884af75e9df2365</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image/lang" >
-<md5file name="lv.js">560238a26a83c9a5772a0a66aa8c6496</md5file>
-<md5file name="cs.js">aba848bb94ad4ed9c3e4dc3089283444</md5file>
-<md5file name="bg.js">a2136087f9caf4b0cac18229f3690dc8</md5file>
-<md5file name="zh-cn.js">41b3681c9defb8e0762bbf7c1397d821</md5file>
-<md5file name="km.js">8de0815b2069fb7f1cb1ec3044751918</md5file>
-<md5file name="sk.js">1cc42aa2860a8d3c7f3e62cfa327e7cc</md5file>
-<md5file name="vi.js">6e4ca7bb21309d0864ff5b4c35d812ef</md5file>
-<md5file name="tr.js">a11798714ae699ee25d3f54265e4fb30</md5file>
-<md5file name="sl.js">b2006f50997760d862e35c5c360226cb</md5file>
-<md5file name="es.js">865cad73eb89c01651d884589bd4763f</md5file>
-<md5file name="si.js">40750367691dd20603551d026b2cf4d4</md5file>
-<md5file name="ms.js">d754c0655472ca097ebdfe812abdb264</md5file>
-<md5file name="fi.js">e0cf2713564fac2e99a72ee6ee57925a</md5file>
-<md5file name="en-gb.js">8b1a3789e6ee83787a070eb690990dab</md5file>
-<md5file name="en-ca.js">a2c77b8f765e5d093138b59ddecee582</md5file>
-<md5file name="af.js">65ebc33d28ef411e036d5649afea5d00</md5file>
-<md5file name="ug.js">154583a21b3d64d8b26cf410f241793e</md5file>
-<md5file name="fo.js">31cacba9e412c90a0f9f21e9ad9c81a0</md5file>
-<md5file name="en-au.js">8151355b62e2515b90d752fc32452a54</md5file>
-<md5file name="fr-ca.js">ca00bc92c1e71069f89c768e3176a0d5</md5file>
-<md5file name="bs.js">b9f778b98c45c31ec95691a1fc4740d3</md5file>
-<md5file name="ar.js">0cde5a1109bd464ea2b1724328cc6a62</md5file>
-<md5file name="en.js">613574e726883dbcd2d93c1e7e968f1f</md5file>
-<md5file name="sr-latn.js">851dbeb4901fed90de52fe0d4336ce0b</md5file>
-<md5file name="fr.js">aba59b9e43759d10a9da893198c8e9eb</md5file>
-<md5file name="zh.js">53475de47389aedff8e7f9c603230184</md5file>
-<md5file name="fa.js">59c3dc093e6bc0bc0881730531898dce</md5file>
-<md5file name="ca.js">2ea6dda2513d324414bbd8ac05b79d0f</md5file>
-<md5file name="pt.js">34100700bf8a90401fa1bc3863a5ef06</md5file>
-<md5file name="el.js">194e20e5ee6c7a5c79eca598e1665bdc</md5file>
-<md5file name="et.js">bb155e898159727529c39dbfde416f01</md5file>
-<md5file name="nl.js">bd72a5424aac4b4038a2f4cb2af74c8a</md5file>
-<md5file name="gl.js">0a19bcccb97274a88b86003285637260</md5file>
-<md5file name="he.js">bee383a14dacb5f2ba3b1deb8b84f54d</md5file>
-<md5file name="ro.js">035255a8d30488964e4677513bc14789</md5file>
-<md5file name="sr.js">829c46e07c543f12879941999be47123</md5file>
-<md5file name="gu.js">e5f41d8abd451b44c5f92bfe6780b692</md5file>
-<md5file name="bn.js">8b914474fc3f2502f64f5e8288443a34</md5file>
-<md5file name="eo.js">096402ea8d76b9a8bc2c4cc56a4cd823</md5file>
-<md5file name="hi.js">a9bd287a830192f3038bb327df668791</md5file>
-<md5file name="no.js">b5f41268ad9db1a4578bbb4d5eb07b9e</md5file>
-<md5file name="eu.js">16fb1e3b659211cf67245486cbd9ef3d</md5file>
-<md5file name="uk.js">bfa591574eed530ac9577fffa5fc543e</md5file>
-<md5file name="hr.js">b6652eecc62028456111cf056d8b5812</md5file>
-<md5file name="pt-br.js">b1cb4d617393d1f38502b65b988df321</md5file>
-<md5file name="de.js">15feaea674502dfb321e05240f7e10f9</md5file>
-<md5file name="mn.js">68f6059323f7587650925bba9dc6caf7</md5file>
-<md5file name="sq.js">f77470d1c3c831b2f443b8a1bb7e553f</md5file>
-<md5file name="ko.js">9d74fcb626d5beaabb3f6b6d3b7b8ef1</md5file>
-<md5file name="is.js">96f19a72812f90d34846cf72b4bb09cc</md5file>
-<md5file name="it.js">b60a3bdd85a269e7dd90252f987e7c0e</md5file>
-<md5file name="th.js">1721b63576167a05f0e306f6baabe3e0</md5file>
-<md5file name="id.js">dbd015b2051d98db083351905f5d03dd</md5file>
-<md5file name="nb.js">3f0605393e4248214bb0d8014121f1b6</md5file>
-<md5file name="ja.js">014e0b3032e71c8874ce0a44adae40fc</md5file>
-<md5file name="pl.js">76f05447a6e19b0ba92e8913db3f0475</md5file>
-<md5file name="ku.js">590f0e56dda084a184fad737e6b8d80c</md5file>
-<md5file name="cy.js">7371f1cb0309696c7d6ac33ad75a5c89</md5file>
-<md5file name="hu.js">5df6c6102516a57c741fdfd303c4ecda</md5file>
-<md5file name="ka.js">687367c7a131a2b0b660f0ca30aabf73</md5file>
-<md5file name="da.js">2281057903ffd3f5b0a4bf95ce8d3aee</md5file>
-<md5file name="mk.js">2bd55711575c9ed0f34ce5d891e63cd5</md5file>
-<md5file name="sv.js">34c94d5146f17226fc5af7ac3ba81d6e</md5file>
-<md5file name="lt.js">4697bf31f23200726d4fa8da13ebf106</md5file>
-<md5file name="ru.js">f2cd34ee65ce4804dd5f49d5d8d764ce</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image/dialogs" >
-<md5file name="image.js">bfdeb2451b2f7fc2e429b93a7fbe8c8d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image/images" >
-<md5file name="noimage.png">77404b5590596de508a542979f3cda84</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/image" >
-<md5file name="plugin.js">4cd22b579216b800efaebf4ad967f4b9</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/stylescombo/lang" >
-<md5file name="lv.js">7707f892d65975d434b0d353274ecd37</md5file>
-<md5file name="cs.js">128d503e78dfb80bb117f36e08c29e77</md5file>
-<md5file name="bg.js">88946514351c89d510346dcfbed7c237</md5file>
-<md5file name="zh-cn.js">639c6622389ed4d92dc5203af5450b2e</md5file>
-<md5file name="km.js">c6b27890c0485cd16677d56507551416</md5file>
-<md5file name="sk.js">30e323cd262fffbfa81d283aea3a7c4c</md5file>
-<md5file name="vi.js">b347b3f7ec52933999acb9dd40334b5e</md5file>
-<md5file name="tr.js">752f4ab14934dc51b0e1c7533218e66c</md5file>
-<md5file name="sl.js">22a3574e96ebf1e8a38c44fd8a55d411</md5file>
-<md5file name="es.js">cc26117afd59cd39f0aa7850b4118848</md5file>
-<md5file name="si.js">0b8f23197743e7e3fdbb330162606a47</md5file>
-<md5file name="ms.js">8ad26513a0572bca3544c64042be6bda</md5file>
-<md5file name="fi.js">8dc9ba170a1391983e685113ea06880a</md5file>
-<md5file name="en-gb.js">75914188f4dd766686e1112476f537f2</md5file>
-<md5file name="en-ca.js">f5022c47307973fa47ec431adcbbfd23</md5file>
-<md5file name="af.js">85cfee1df402b0e6edd3c00ea301949e</md5file>
-<md5file name="ug.js">f18db89f637d124187becb74e306f8b1</md5file>
-<md5file name="fo.js">685dd527cfbc1fd0f81a577209f5fc97</md5file>
-<md5file name="en-au.js">ab13630cbd56a3e966841bb42bc97ec3</md5file>
-<md5file name="fr-ca.js">687a45c78ca99dda76c3551e804b0a8a</md5file>
-<md5file name="bs.js">8730b71b7adf7b84e6d2e7cae5ad46ea</md5file>
-<md5file name="ar.js">1ff4c951aec067c3608ab6ec27d3f365</md5file>
-<md5file name="en.js">ff174d3693adc6caa5d8b288bd7af1aa</md5file>
-<md5file name="sr-latn.js">a1bbb530fff30728fafa1b28aa715869</md5file>
-<md5file name="fr.js">664445e2248ad3b95fce168000f88c6e</md5file>
-<md5file name="zh.js">54d4fedce75e01c45dee02b803114969</md5file>
-<md5file name="fa.js">a8659fc797d16b15fe111d5daf904aee</md5file>
-<md5file name="ca.js">720a5708df097d7ff4ada620e7581a07</md5file>
-<md5file name="pt.js">0d455ea395c76621e0dd5a7716c63450</md5file>
-<md5file name="el.js">57dbf0be20009c16757813d53ddc5c7f</md5file>
-<md5file name="et.js">4fd49cdd0ab52eb820b06f6b91f7b535</md5file>
-<md5file name="nl.js">4c1dcfed2ae2814618e2a45010459d37</md5file>
-<md5file name="gl.js">44868567341823104594ced2f842d48b</md5file>
-<md5file name="he.js">11b04aa7980130f62e3ac1bcd0e93a5e</md5file>
-<md5file name="ro.js">0042f12911964e76802761cb775e14b8</md5file>
-<md5file name="sr.js">b570f6494885f32748a306efaf7c6d4a</md5file>
-<md5file name="gu.js">8068829accf72a96bfe8000f56391f7c</md5file>
-<md5file name="bn.js">a8e08e0a047ed303115fc61362bf186c</md5file>
-<md5file name="eo.js">32a94143326b67c8d178b6132e3b725b</md5file>
-<md5file name="hi.js">96b997c9623e32c40c37b30feafde59e</md5file>
-<md5file name="no.js">5daef170c5fbe68cd5f100d107e01504</md5file>
-<md5file name="eu.js">4afe82bd50007fb49423ca8a311cb00c</md5file>
-<md5file name="uk.js">c8c4bdb4a1b617322cfcd26fd926e58f</md5file>
-<md5file name="hr.js">c5f4573cdcd1b640a2a2b708c6183d47</md5file>
-<md5file name="pt-br.js">948ca535f90f2dc7ad9107cfa7aa53f9</md5file>
-<md5file name="de.js">82bf1c25a7d5e5c391280bca715092e8</md5file>
-<md5file name="mn.js">01378ce47159a00fc35ed3a2b0c5f38d</md5file>
-<md5file name="sq.js">39be56b5d7583f5d2b0ccc6fdfc769dd</md5file>
-<md5file name="ko.js">5c678c0150ec5275dfda6d176794728a</md5file>
-<md5file name="is.js">f000ef2caf08334b13d4a2e394432612</md5file>
-<md5file name="it.js">62c402b877c46cf02cc35beb17a1f731</md5file>
-<md5file name="th.js">c1ae7e25e06352749f6fb0642ac45a24</md5file>
-<md5file name="id.js">c4ac34f0381e28b826a88de77b97cd68</md5file>
-<md5file name="nb.js">8edda65f22bb0c407203d1402652e3a0</md5file>
-<md5file name="ja.js">a46fb6600d397ac28629fbd869821160</md5file>
-<md5file name="pl.js">3113648d39e5735411d9c11e780ad4a9</md5file>
-<md5file name="ku.js">b2af0f5e003d559139701663a502cae4</md5file>
-<md5file name="cy.js">e85e4d6872aac0ba336e6668e896985d</md5file>
-<md5file name="hu.js">d9518e038a35a88a20e66e0bbc07e5f1</md5file>
-<md5file name="ka.js">efb7ececd6c8a55a744c4215dc178926</md5file>
-<md5file name="da.js">32d36311e6dc45a2416667c034f7d461</md5file>
-<md5file name="mk.js">4e2a0fcc1a79296818800542d47b78f1</md5file>
-<md5file name="sv.js">5c0a653e0953467f63585f1122af3a6c</md5file>
-<md5file name="lt.js">4471c14eeea5f72781d82f17895d5aa5</md5file>
-<md5file name="ru.js">f0f59095d0e9130e93b9e5e084868a21</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/stylescombo" >
-<md5file name="plugin.js">146a3438dc882b98c821e65ccb6533af</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/floatingspace" >
-<md5file name="plugin.js">48efb991345980388b972a538c801e3b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/floatpanel" >
-<md5file name="plugin.js">decc55acb3447421b0a38d668853ebac</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/list/icons" >
-<md5file name="bulletedlist-rtl.png">903f2c24d07168492b4cd9d513366b36</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/list/icons/hidpi" >
-<md5file name="bulletedlist-rtl.png">730b2178e96e36abf7595d4663cb9a71</md5file>
-<md5file name="numberedlist-rtl.png">2c98b4264c72874757a6eb6ba708f159</md5file>
-<md5file name="numberedlist.png">2f05ce9a8e0b064f051662429cbe7c15</md5file>
-<md5file name="bulletedlist.png">b981877c761b388a5c2258afe118ab07</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/list/icons" >
-<md5file name="numberedlist-rtl.png">0018a234ac89fade98a4a34b682c0be7</md5file>
-<md5file name="numberedlist.png">49888cb47623a90b671b82c07bfd7755</md5file>
-<md5file name="bulletedlist.png">6104899503d5d45f216a16d791cdc09a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/list/lang" >
-<md5file name="lv.js">e9a6b8f89d741f5f66cdebe5338b94dd</md5file>
-<md5file name="cs.js">0cb79627c76e9f5a2f6d0028fd5b9c7a</md5file>
-<md5file name="bg.js">de1a854afa7be8bffb6094cea1ae0f49</md5file>
-<md5file name="zh-cn.js">69835eb2a149e57a6bdcf506cdd470e4</md5file>
-<md5file name="km.js">f74615c4acf2c37adce3468715ce1883</md5file>
-<md5file name="sk.js">02684a3aa4e0fa3c70c8f3ac18ec44e6</md5file>
-<md5file name="vi.js">1a326cb3e268428027376c7968813552</md5file>
-<md5file name="tr.js">fe7c7f4957cf56fbd2fc5d04489bdbbc</md5file>
-<md5file name="sl.js">b144bf1399a9c3bf537f87091ac51af1</md5file>
-<md5file name="es.js">0b83651cbd18a25b1278851cb42c7a16</md5file>
-<md5file name="si.js">7632beb918653ccbbfcc1943e9739d3e</md5file>
-<md5file name="ms.js">6d2f4f0c4588bab4192c5aa999f39e27</md5file>
-<md5file name="fi.js">387a6465de40b3d3e07d68612c97a169</md5file>
-<md5file name="en-gb.js">ef7d42f093f18a724028545bd3e10c0d</md5file>
-<md5file name="en-ca.js">7835fd21fa3387409f2cfda2adf3bbb0</md5file>
-<md5file name="af.js">6a8173b88aadb794a256bbb80862dd37</md5file>
-<md5file name="ug.js">dd814a607d93845515a52317fff7d7a2</md5file>
-<md5file name="fo.js">ed1d4ac42414cbbf8d0a8fcce9be5aea</md5file>
-<md5file name="en-au.js">acc7f66154278876e21c427c3d31eb75</md5file>
-<md5file name="fr-ca.js">db0c97e5870453e77ba448f874662423</md5file>
-<md5file name="bs.js">2f03bb3e6cc6e7af97d2e139cdbc373f</md5file>
-<md5file name="ar.js">3232538a85b81791d4ddf6aa78457ca9</md5file>
-<md5file name="en.js">2a1ec952faff1c8a3896d599a031f928</md5file>
-<md5file name="sr-latn.js">c84423522d204853ccddb147550f342a</md5file>
-<md5file name="fr.js">79c3ea0423816e32bfe05ebacdb52cd7</md5file>
-<md5file name="zh.js">47a41514248347535aeca61eb3e5f87f</md5file>
-<md5file name="fa.js">733abe84eaf125cfff136c23c09bad77</md5file>
-<md5file name="ca.js">a1666383d423bf454b13130f0d4fc234</md5file>
-<md5file name="pt.js">2efed899cb065cd7ec7f0e3c2e012396</md5file>
-<md5file name="el.js">fcf4a19d65287dc290223e9555f6e7a2</md5file>
-<md5file name="et.js">ff05ba323fcc1b2f9b31fe6085ecf329</md5file>
-<md5file name="nl.js">4eb088fc41f820bfadb4930da1669e46</md5file>
-<md5file name="gl.js">6627e78497bebbfe7d03c9e5929951d1</md5file>
-<md5file name="he.js">7d6596134647efe995e984474a711bfd</md5file>
-<md5file name="ro.js">dc6144c7724d4e5d4574847c7b63fc6d</md5file>
-<md5file name="sr.js">f3099ec7f12a24bd061fe25d1182b16a</md5file>
-<md5file name="gu.js">1236fa5e516b6ddfe391f42c142d120e</md5file>
-<md5file name="bn.js">46713812c6e45c0243387d22d6f8622a</md5file>
-<md5file name="eo.js">3e58a741e320f2e35a95cb1df2ee7e6a</md5file>
-<md5file name="hi.js">ccf3bd5df0a92678efeebb27ba759e33</md5file>
-<md5file name="no.js">54b9e40db64a48de20f8d0643f1224d6</md5file>
-<md5file name="eu.js">dd3e4baee07ad530f36b53c699934600</md5file>
-<md5file name="uk.js">49bcefc242ac99efdf656f0f95757eb6</md5file>
-<md5file name="hr.js">197b01e4a102e93a75a70a0a80789885</md5file>
-<md5file name="pt-br.js">b6f9dee6600c7c3e668af4b732be80f3</md5file>
-<md5file name="de.js">898721e70adc38efbdbcb3757dce762a</md5file>
-<md5file name="mn.js">c718afa7838175f9d03ddbc04dfca03c</md5file>
-<md5file name="sq.js">2a9472fdeb3f13f6e9a7e05ccb5a5666</md5file>
-<md5file name="ko.js">bd3283d5022bfd341064e344c0188365</md5file>
-<md5file name="is.js">591551f798f0cfd1507bd360c4ca8777</md5file>
-<md5file name="it.js">6c4381828243cc9d1e84080df62cf43e</md5file>
-<md5file name="th.js">78a6e71c5b6002761a34323f85e03946</md5file>
-<md5file name="id.js">7666e65fc755c867b1aabc0217fcefae</md5file>
-<md5file name="nb.js">51086417bb7cf0f16f213a9bdb571002</md5file>
-<md5file name="ja.js">38fb12879e47ec572fef934b1224b272</md5file>
-<md5file name="pl.js">b576e50720b63f798eefb315703c8cff</md5file>
-<md5file name="ku.js">c38283cdeaa95378218d3665cc597c9b</md5file>
-<md5file name="cy.js">0b190ad7f8168e07facfa8d4d34c665b</md5file>
-<md5file name="hu.js">a94d05759d168786d31b91b9b742a47f</md5file>
-<md5file name="ka.js">7f9810edad92becc0a5fa850f4d92550</md5file>
-<md5file name="da.js">01b0e97a8103bc9b715f35b4ebad33cc</md5file>
-<md5file name="mk.js">f540b3ee0426841d5c3b410ac223642b</md5file>
-<md5file name="sv.js">753f7961e38db702eb94f35a5ec0a691</md5file>
-<md5file name="lt.js">73181022f59b20bf9878c2f4ab88dcfc</md5file>
-<md5file name="ru.js">4790650b0d5ff5ee1d53c743eb0eceb1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/list" >
-<md5file name="plugin.js">0e01bf38772c698d9b5d4c2aed89bacd</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/justify/icons" >
-<md5file name="justifyblock.png">8a873d673c98970c8e7a1a583ad3bf69</md5file>
-<md5file name="justifycenter.png">d3411df3119a34813c2843d410542e6d</md5file>
-<md5file name="justifyright.png">adba5f2e8aea36ae13491de788d3cd29</md5file>
-<md5file name="justifyleft.png">f92e5160709f56509dc816e483a1d13c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/justify/icons/hidpi" >
-<md5file name="justifyblock.png">6227aba90c0bea16120263d97a144acd</md5file>
-<md5file name="justifycenter.png">9fb077a1e341ec0e5b98ad4e185fd22d</md5file>
-<md5file name="justifyright.png">dce28e58d0613b9042843c263adbe2d9</md5file>
-<md5file name="justifyleft.png">1fbf7dacf324a615b97aeec5b983f4a8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/justify/lang" >
-<md5file name="lv.js">866057ad079489fe7e32838d8c499380</md5file>
-<md5file name="cs.js">41db43f5238fea2640e496a67e97c1c8</md5file>
-<md5file name="bg.js">6d4d90557420948fc764041b7341a4bd</md5file>
-<md5file name="zh-cn.js">e676ca891c4261577e3d0702c7f4c25a</md5file>
-<md5file name="km.js">a876bec439bd56f63e52aaf6551e9624</md5file>
-<md5file name="sk.js">9864405349e038742860612798e6a918</md5file>
-<md5file name="vi.js">346beeebdd3a7079e71b62d5938889ab</md5file>
-<md5file name="tr.js">717ce376997563e923eaec2c9fa1c106</md5file>
-<md5file name="sl.js">584219e2ee406f237e1ba56d08b11f95</md5file>
-<md5file name="es.js">76509ad5ab8986b87491407540d2984b</md5file>
-<md5file name="si.js">62d9b8189157bd1bbb683f252ff6169f</md5file>
-<md5file name="ms.js">0f95064fd9f16a82c99f4fac06d3a737</md5file>
-<md5file name="fi.js">d51316e9ad60e35da9b7a84992bbf53a</md5file>
-<md5file name="en-gb.js">8c0eaf4e49ebc4b64dad07a574ddb52d</md5file>
-<md5file name="en-ca.js">34cab56913a12c8f3cfbdd7cbedba361</md5file>
-<md5file name="af.js">7e71199d2334d96bf245fa287f5a4a1a</md5file>
-<md5file name="ug.js">47521b7184d705554518a3ff1f94073f</md5file>
-<md5file name="fo.js">4a1a0fbbaca8abf409c6f16a109b7aba</md5file>
-<md5file name="en-au.js">2b866d348468dbe6404f6c56f448f9c4</md5file>
-<md5file name="fr-ca.js">33fa3560ac1f86f39f5a2c9ca61b993c</md5file>
-<md5file name="bs.js">2c8a34dbcf92650dfd9b6b2a68bbb906</md5file>
-<md5file name="ar.js">5e37a2ee5874098bafa6c51cfea80123</md5file>
-<md5file name="en.js">502ea8699641cf83217b6cb5972cd1c5</md5file>
-<md5file name="sr-latn.js">a635cd73069c12bb0e0e81d4a7a39c8b</md5file>
-<md5file name="fr.js">c2ec5e1cb7d7d288f3931fb32673b60d</md5file>
-<md5file name="zh.js">a123b9382bd9ef7386175f1f71528486</md5file>
-<md5file name="fa.js">325aa87334b1ebefbc8d879248d300ca</md5file>
-<md5file name="ca.js">d05920075a6b578127adbc1b6592fbce</md5file>
-<md5file name="pt.js">7d50a67aa58530da49dfa5f21d2ab35e</md5file>
-<md5file name="el.js">31b50a949a9663738ef5d8ce1e3a9f7d</md5file>
-<md5file name="et.js">9cc343774932c4ce9f66bc38b232cbc5</md5file>
-<md5file name="nl.js">5f271406fa10507bde1cda5dfda82514</md5file>
-<md5file name="gl.js">110f53f6746e569898757a8de6a9b880</md5file>
-<md5file name="he.js">cdc6e9c3375ace1bf1ec3ce9b7a95b20</md5file>
-<md5file name="ro.js">6dcfc5060233f29772b6c99ad7c6f188</md5file>
-<md5file name="sr.js">87a5ef6d5b632077c6bbb92fe3b9fed3</md5file>
-<md5file name="gu.js">a0acc37715fc34be00d3fc5720a67c65</md5file>
-<md5file name="bn.js">6d0cbc4ab99cedb6152d97d40383d3f9</md5file>
-<md5file name="eo.js">b45f087d77eedf4d7c63a4c4f1970bb8</md5file>
-<md5file name="hi.js">b6650f4118bafaaf48e623b4523bce8d</md5file>
-<md5file name="no.js">e48c8bc4397207061bf9672ddb7504f8</md5file>
-<md5file name="eu.js">f44efd782607f2a29ac3a09a8a8686f3</md5file>
-<md5file name="uk.js">443d60344ed3ec1decde608ba71cb29d</md5file>
-<md5file name="hr.js">c6b327fc7149061e10a3de9b2f5395e2</md5file>
-<md5file name="pt-br.js">3d34025630c995e743260ef6fdd83690</md5file>
-<md5file name="de.js">89267d685e2a8de5a1bd2ac67d9a1292</md5file>
-<md5file name="mn.js">6dac2208bf80ae8ef95ee1270dc0fe9a</md5file>
-<md5file name="sq.js">be4e7ef4697e4939dc614302f0509d74</md5file>
-<md5file name="ko.js">e674a2cb9e2218198d8b8bc056097f3d</md5file>
-<md5file name="is.js">b7e65c55dd1db4b7d2a0a569eac854e2</md5file>
-<md5file name="it.js">73fe1c847d82415bd179e0a776f53936</md5file>
-<md5file name="th.js">d55016476f3bb7d1dd767fe8acca0c39</md5file>
-<md5file name="id.js">c255d5dd8cb46c1619c2243649945423</md5file>
-<md5file name="nb.js">69827e6237546ba1da3fefe76ada31ef</md5file>
-<md5file name="ja.js">d078560c79300da89352b34e319df9af</md5file>
-<md5file name="pl.js">af144dad27092ed2076a2954faabe9ea</md5file>
-<md5file name="ku.js">b3484084cdb615343b7ba6ac9701d6fc</md5file>
-<md5file name="cy.js">2ddd9cc3010c8f0cafaa92d8aa22c087</md5file>
-<md5file name="hu.js">dfa2272a26e608fd14263e0c7b15578e</md5file>
-<md5file name="ka.js">cf8945e482db9bf76d77af1580965378</md5file>
-<md5file name="da.js">52f495a9cb8521fb22e921337b35ff8b</md5file>
-<md5file name="mk.js">a51b8f8a516859bc9a9897b3a57b38ba</md5file>
-<md5file name="sv.js">79e52827473a93a473166e21d3346138</md5file>
-<md5file name="lt.js">f75871ec96c9234377b3921fc4b1fdd3</md5file>
-<md5file name="ru.js">e46cd3a29608b66bb2818aa1792e8797</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/justify" >
-<md5file name="plugin.js">15e73b634e4d8aaa8f17409806133a5c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/a11yhelp/dialogs/lang" >
-<md5file name="lv.js">ba07bc8eb2bce812a1d2040905149fa4</md5file>
-<md5file name="cs.js">aefd18959df85443c31ded83a17ce11c</md5file>
-<md5file name="bg.js">6ef0beafe86b835ccf854c1a92cec69f</md5file>
-<md5file name="zh-cn.js">dd89569990b558fd73df26d470738628</md5file>
-<md5file name="km.js">8f1044e1d1fa94a1136be2093ba4cb2f</md5file>
-<md5file name="sk.js">3a778b1f22c9fc3d1b599131fbe16f4a</md5file>
-<md5file name="vi.js">015653fc33b263a5b28169fd824db09e</md5file>
-<md5file name="tr.js">46fc048c4a7514cdb99e9b437f526d13</md5file>
-<md5file name="sl.js">c03334df58008c983387bfece1426c9d</md5file>
-<md5file name="es.js">2b424d9e6d8e59302b9916a20241e52a</md5file>
-<md5file name="si.js">e8aabf620e6a5d98b7cc2c64c6b0af74</md5file>
-<md5file name="fi.js">4b871b31bd8de664d48b2f29458f6db3</md5file>
-<md5file name="en-gb.js">11bd0047df947ab88590059a78e16ff1</md5file>
-<md5file name="ug.js">f8e0a1a8f13733d6a7a5270fcebae393</md5file>
-<md5file name="fr-ca.js">634b15f413f91c22de004de56830b035</md5file>
-<md5file name="ar.js">293eb819c592c012e300fdc18b3b0ca1</md5file>
-<md5file name="en.js">83b0a925f2ca66740d1e8c11a2dab0c8</md5file>
-<md5file name="sr-latn.js">97594b67e693c6b57969599b64a15b41</md5file>
-<md5file name="fr.js">6c59e43757c9c401120359ee46ddfbd7</md5file>
-<md5file name="zh.js">a751778d6a7d2387bb61b5adb378adb9</md5file>
-<md5file name="fa.js">8013ac340c2505e26de39c361b326ca9</md5file>
-<md5file name="ca.js">90e542e8785b3a08b183ac28aa574de7</md5file>
-<md5file name="pt.js">be4640834859b04f5a0ef291471be787</md5file>
-<md5file name="el.js">2f20a73be82bf96207f148a3ab31e36a</md5file>
-<md5file name="et.js">d505eea409a4c2415a12b3240b4e7d78</md5file>
-<md5file name="nl.js">e7439a0718652088eb46679f10b75f30</md5file>
-<md5file name="gl.js">f085dd2f8370d44dac293957cdbf67ce</md5file>
-<md5file name="he.js">7fdf271038be6c5e9018c1cca6d3ab85</md5file>
-<md5file name="ro.js">f334305f7a526767cd39ad271952e783</md5file>
-<md5file name="sr.js">f28b76a2a50fea055e7dee2bdceb7562</md5file>
-<md5file name="gu.js">8e8f2342574c3f374678d3eb23c78ce8</md5file>
-<md5file name="eo.js">5db09e799c2817e5d7d43c7178cf142f</md5file>
-<md5file name="hi.js">0a508c373b6e833d8d2a09d57b8565cd</md5file>
-<md5file name="no.js">f8d11c86b5dfc618655478757f5e1c84</md5file>
-<md5file name="uk.js">b94ee3e355209d8e560600e45475d9f8</md5file>
-<md5file name="hr.js">a6875466be585088add2e326588a462e</md5file>
-<md5file name="pt-br.js">4fe9a2c16f1741bf588d581012ee7c24</md5file>
-<md5file name="de.js">d333b0c4e981f824e1b6349458ddb2e4</md5file>
-<md5file name="mn.js">197445ba8fa68273f8d506c6c684128a</md5file>
-<md5file name="sq.js">ed467f7a3f09b21ae9fbf7cdf85e92c4</md5file>
-<md5file name="ko.js">0c1e7e4facb9242d5b5299603bb0a36a</md5file>
-<md5file name="it.js">34fddeba90f9a39442fc8d0fcb1f0fe2</md5file>
-<md5file name="th.js">8a06f205553f05c953067ca5272f7800</md5file>
-<md5file name="id.js">7e52e6107c178007bf76b14a8b542dd5</md5file>
-<md5file name="nb.js">17337154b07f2ae57043031c0240a5f9</md5file>
-<md5file name="ja.js">abc6ff7471a439c3fd4c7a1e4824d2c0</md5file>
-<md5file name="pl.js">8fbc8ba712ac0c6849d40b83a81d0e56</md5file>
-<md5file name="ku.js">16f9242faae03079564ce4a8a1e73ac7</md5file>
-<md5file name="cy.js">aea7950d0d1571aaa570b963a26c47ee</md5file>
-<md5file name="hu.js">8373a764a7ee48b781f6317dfc722ffe</md5file>
-<md5file name="da.js">988c6509ce54baa98d85a019c9009e7b</md5file>
-<md5file name="mk.js">ba461beeb4645d9135a8a0c9378b300a</md5file>
-<md5file name="sv.js">3bf25c192fbd7a2440342bf0dbf3e789</md5file>
-<md5file name="lt.js">79993e0fd423b00535d60ca50932f279</md5file>
-<md5file name="ru.js">80ff9bbb6e5bcbe8f2bc1d29e531683c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/a11yhelp/dialogs" >
-<md5file name="a11yhelp.js">53304157a61719498aafb6d14629c970</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/a11yhelp" >
-<md5file name="plugin.js">202e57e1f2578b749e55a931c7c3ed49</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/table/icons/hidpi" >
-<md5file name="table.png">5a2ad8755f17303808847633d189ea5d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/table/icons" >
-<md5file name="table.png">04a3847804af946c34ed58e4a9d3eded</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/table/lang" >
-<md5file name="lv.js">538dbfd4ad06c3907f75c86543063ef4</md5file>
-<md5file name="cs.js">132d1087675ee7be2e15150b5911e830</md5file>
-<md5file name="bg.js">d23d9fae5e3471e0a43c4f8913ac71ff</md5file>
-<md5file name="zh-cn.js">5b73046afba55901acb028cf26459847</md5file>
-<md5file name="km.js">6db46553ad49d8cc62977513fbc122c9</md5file>
-<md5file name="sk.js">4c77b990588f8c567dafaa8dea2d1af8</md5file>
-<md5file name="vi.js">534cb2fb7f566eead9fc4d8ef33d99d3</md5file>
-<md5file name="tr.js">43bbf14fb91c6e401cc17ad26463cb30</md5file>
-<md5file name="sl.js">e5feadc0b8d745697956ea2adac95065</md5file>
-<md5file name="es.js">bcb7f401ad3609ce70899241bf4ce292</md5file>
-<md5file name="si.js">633ef5a001c1d0d102653abf2ab39611</md5file>
-<md5file name="ms.js">f5b23eb364ff3fa1759b988948ea85d1</md5file>
-<md5file name="fi.js">7e0853471fa2c39842af65fe25406219</md5file>
-<md5file name="en-gb.js">ff971213cafa87b9a0bcdd94e0ece8a3</md5file>
-<md5file name="en-ca.js">053b5f60b782a1bafa0bd41d3c433a1d</md5file>
-<md5file name="af.js">1735251075c6340d7002784b214b456c</md5file>
-<md5file name="ug.js">5a6afe1158f28fde9b726c5201fc0f2a</md5file>
-<md5file name="fo.js">75327548ab625afc438a4be204e4d0a5</md5file>
-<md5file name="en-au.js">8ba662099c5baa99532e13b759a58a0f</md5file>
-<md5file name="fr-ca.js">c62bb50dc9bba44cc9669a970e47e8d5</md5file>
-<md5file name="bs.js">f71b5c95a615e672f2ea326bf2b60db6</md5file>
-<md5file name="ar.js">275fcbdcf6cf367fb9d3a4ff1ecb4ce7</md5file>
-<md5file name="en.js">cae9d8045ba0a0baf1c028020541fca7</md5file>
-<md5file name="sr-latn.js">23f67d63140d11accfbee7bec1ec283f</md5file>
-<md5file name="fr.js">2fc2563909edc54ed91d37c7d3898fd5</md5file>
-<md5file name="zh.js">000c85c95f433df8930acfa34774fde0</md5file>
-<md5file name="fa.js">86ff7473d2ca25eb055fbe794bafc472</md5file>
-<md5file name="ca.js">3cda05435e8c01a4b6d35899f7eff465</md5file>
-<md5file name="pt.js">b45cf3999cee9f61c18dd7d1715af65d</md5file>
-<md5file name="el.js">f0273f3d0c92180c8188a8858cbf61e9</md5file>
-<md5file name="et.js">cda62084753f224d0a6456a2428a2e89</md5file>
-<md5file name="nl.js">56300b715f1fda9c6653153011c995c2</md5file>
-<md5file name="gl.js">60f91114adae55ef0303695d42e58b46</md5file>
-<md5file name="he.js">689fdf742b8557a9559495e442fc2fb8</md5file>
-<md5file name="ro.js">1e58e80fac734bb1326bae32e654a9f2</md5file>
-<md5file name="sr.js">0199b65a17b17381c2f4d876a9776f56</md5file>
-<md5file name="gu.js">df5c17977324a9f462d3d56fa2bba89f</md5file>
-<md5file name="bn.js">ce11ee2e7fabfae1f603fc5a7a58a6ad</md5file>
-<md5file name="eo.js">54d73a0f2b0e8fe9bf2aac2340d06d44</md5file>
-<md5file name="hi.js">8b00c222f6251d38d0c569ef3aad370d</md5file>
-<md5file name="no.js">8fb092cf2ee9839b48362848d9f3de03</md5file>
-<md5file name="eu.js">124ce5b27da467279b69783855ed3e7e</md5file>
-<md5file name="uk.js">1859b0693aff46053c183fcc15626105</md5file>
-<md5file name="hr.js">9c1cd25cbb532f3e0b231fda75b3f507</md5file>
-<md5file name="pt-br.js">715aae34317a11cbd5915231e16fec87</md5file>
-<md5file name="de.js">9e98398caae7b17077d0058b88d94937</md5file>
-<md5file name="mn.js">3895e3229dc416a0c28b814d02ca2e00</md5file>
-<md5file name="sq.js">f50887498e1a0be76300190abcc72e51</md5file>
-<md5file name="ko.js">a72501d080cb9bb829a169476280dfd1</md5file>
-<md5file name="is.js">689607fa0fad4b9eba86b1ac19b08237</md5file>
-<md5file name="it.js">209338263e4d3ddbd799b025980d6436</md5file>
-<md5file name="th.js">43ff40adae01510fc1f20d0994727a81</md5file>
-<md5file name="id.js">2f98062a90772f93729c2ada7a45bc20</md5file>
-<md5file name="nb.js">9c5a124b37d8dc2a518f6f710559e570</md5file>
-<md5file name="ja.js">84da593eb8c2320960b1de541d829a9a</md5file>
-<md5file name="pl.js">53a55b3ababbea9f154d74c62f1a6b22</md5file>
-<md5file name="ku.js">a4c3a9a7545e4994e142990d5a58387f</md5file>
-<md5file name="cy.js">48d2bcb938967416dacc402a93909d80</md5file>
-<md5file name="hu.js">d103fb8065c428fabbbe4c885b138c7a</md5file>
-<md5file name="ka.js">ab38212ff73defd1c8fbfbe534c75b0b</md5file>
-<md5file name="da.js">7223ca84c20bee8ff6fbc4f47c8518f5</md5file>
-<md5file name="mk.js">d1bc33f0bdb0b31d8f2c351078338d5a</md5file>
-<md5file name="sv.js">77e8869f3eff348fed0c7c69207a1042</md5file>
-<md5file name="lt.js">b33b43a608a5fa7491869775ffc458c2</md5file>
-<md5file name="ru.js">a799c44bf982bc6a4ba93c4d3d84ec4a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/table/dialogs" >
-<md5file name="table.js">bc835218d97a41329962f0d54b01777a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/table" >
-<md5file name="plugin.js">8612915036f094ce416865172e14e97d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe/icons" >
-<md5file name="iframe.png">cf68254069073f12a201863b736e5943</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe/icons/hidpi" >
-<md5file name="iframe.png">1752a7036efef4ab87c293bdc99a6ef5</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe/lang" >
-<md5file name="lv.js">ce61f11c776100d7781a2f1e80bdd253</md5file>
-<md5file name="cs.js">c2c1de58f780372fa723cf91b29dd84e</md5file>
-<md5file name="bg.js">58b40d3dd0f82414bee402b565e45f42</md5file>
-<md5file name="zh-cn.js">0e7864f7b7f3fd0e500111603c3dbbdc</md5file>
-<md5file name="km.js">aa9f9f8076579ebb988b5fddb117565f</md5file>
-<md5file name="sk.js">12a37231dd9df6bced0a70a162fcd29e</md5file>
-<md5file name="vi.js">e764c61f036660af1390793f559cd15a</md5file>
-<md5file name="tr.js">03ad35fc72a3ee50552a90aacca15c9f</md5file>
-<md5file name="sl.js">2a522071bd65605dee2b97ce28abcb27</md5file>
-<md5file name="es.js">a62f14439f9273f0d757bfc005c44467</md5file>
-<md5file name="si.js">e937dc205ea0564f197bcdf8f758f5d9</md5file>
-<md5file name="ms.js">c7cd351bb10ca27f5e5135c511612edb</md5file>
-<md5file name="fi.js">a0c7413cad31c78be00757a4d696a9b7</md5file>
-<md5file name="en-gb.js">35666c7db479d5ff1399b1487279c793</md5file>
-<md5file name="en-ca.js">63222c5f758cc294bb0e41787be95c07</md5file>
-<md5file name="af.js">6ececb35454176da1813e95478263bd7</md5file>
-<md5file name="ug.js">e6e6ce33b1422bf712053607361f1cc6</md5file>
-<md5file name="fo.js">39efe21774f3459aecf3b7c5f2673fb3</md5file>
-<md5file name="en-au.js">6a12a0fe421e4a943f5fdc7a76c862d7</md5file>
-<md5file name="fr-ca.js">3961f6099feabe54add76f6c43ae718c</md5file>
-<md5file name="bs.js">b658f44e1c6b6886be7ece9762db3641</md5file>
-<md5file name="ar.js">0c881a0aebf3f15ffb44a4c400116bc5</md5file>
-<md5file name="en.js">b4e6032229209b334fe3757e0d5f6d58</md5file>
-<md5file name="sr-latn.js">4f9ee63ded566a36de4b77a537defeed</md5file>
-<md5file name="fr.js">689a14afbd00e0f481b91085e129984b</md5file>
-<md5file name="zh.js">8e2f4a4cd02922d7d5e40738aa6ca7e5</md5file>
-<md5file name="fa.js">c0287826d7c0e72ab0443149be998667</md5file>
-<md5file name="ca.js">4c2d7019cb51d6323c5605badc3462a7</md5file>
-<md5file name="pt.js">72f3897af71eee7f2dbb5070bc21bd06</md5file>
-<md5file name="el.js">af8e31e935468d979fb007bec07e71cd</md5file>
-<md5file name="et.js">eb316ffae28674defd706633e6e15874</md5file>
-<md5file name="nl.js">3ce46c8ec132f2f44018b5179effcbe6</md5file>
-<md5file name="gl.js">b097eb2697f635ce95aee06d7d3a2e7b</md5file>
-<md5file name="he.js">1177aaeb8fe88c302e5b7d7a3a6e39cd</md5file>
-<md5file name="ro.js">4d66d071c1b967db68e1570dee5ac60b</md5file>
-<md5file name="sr.js">43cdfabca51ac1ec8e82096ee825a509</md5file>
-<md5file name="gu.js">efc5f604f027765105d4e8f10eafcb2c</md5file>
-<md5file name="bn.js">77ee294fab4927c6b05295ac7f52565c</md5file>
-<md5file name="eo.js">52730c662e20f0457d617bd222e3363a</md5file>
-<md5file name="hi.js">61619d87d4aa8c7b432f47d8c42a9ede</md5file>
-<md5file name="no.js">fb606b68fc0a94ef747bb5b609ee4ae4</md5file>
-<md5file name="eu.js">7a3655e71885f07ca9a540c7405ed67b</md5file>
-<md5file name="uk.js">5f080bcf82583f9cef8d07bdd7abf41c</md5file>
-<md5file name="hr.js">dede2e95e289800654f3be1d6b4aae05</md5file>
-<md5file name="pt-br.js">8162219cafc1a2a931892a3581a64492</md5file>
-<md5file name="de.js">77203c41eb8c95f8c367efc0d10281f4</md5file>
-<md5file name="mn.js">cb31651660813ebe9130e025d6a48e0f</md5file>
-<md5file name="sq.js">7bb4133e9481f1a3bb5047ed1983ee0f</md5file>
-<md5file name="ko.js">556417b9941a3d4a517321ca7dbc605a</md5file>
-<md5file name="is.js">665d5a5a68a1de104557d2e35ee38f4f</md5file>
-<md5file name="it.js">c5374a7a57b661d075c83e694f29ecb2</md5file>
-<md5file name="th.js">3d45af8782202cf34ed80274c239414c</md5file>
-<md5file name="id.js">376b751819a332d219dc4331b9d9f62a</md5file>
-<md5file name="nb.js">1d1c1eaa6cd7ca65cc1cc163f962a206</md5file>
-<md5file name="ja.js">90d0f624581156184f07e08e3d5432ea</md5file>
-<md5file name="pl.js">6de95928c986caf142526e2290d71813</md5file>
-<md5file name="ku.js">cb554f4400d9f2ab8b0d05d037b3b987</md5file>
-<md5file name="cy.js">6283f604b51b4c8436c19989d1d04c3d</md5file>
-<md5file name="hu.js">afce0de88f049a56a0e2b1d7ef58514a</md5file>
-<md5file name="ka.js">25a25ecfc0e1b63fac9ddfacc0cdf8df</md5file>
-<md5file name="da.js">8ab789172fe09ae5895b1e59ab201ac1</md5file>
-<md5file name="mk.js">d58a433bac370d044569b7d8bdec99fc</md5file>
-<md5file name="sv.js">c1fc94b7fd1c4a40071501d0e062c9cb</md5file>
-<md5file name="lt.js">4ba5542783c491b5585f72f6e24b38ed</md5file>
-<md5file name="ru.js">30ca3cb8c6b80285993187191322a178</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe/dialogs" >
-<md5file name="iframe.js">82c1b74104395011f886f59c92dd03d7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe/images" >
-<md5file name="placeholder.png">952e216a7803312fa67ee61c06f3c532</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/iframe" >
-<md5file name="plugin.js">7c09d7502b1003f037335975bdf8c7dd</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastefromword/filter" >
-<md5file name="default.js">60e76204774e71ef96b26185d68d38c4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastefromword/icons/hidpi" >
-<md5file name="pastefromword-rtl.png">274f439e4dfc674581c0c72fbc7ed430</md5file>
-<md5file name="pastefromword.png">0e3faa2a3959f81d79377f971b7aca93</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastefromword/icons" >
-<md5file name="pastefromword-rtl.png">a519b7d68b3059c94689ff74a4740d8e</md5file>
-<md5file name="pastefromword.png">426f07c0798e1505ba9e971f2dd47313</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastefromword/lang" >
-<md5file name="lv.js">0f3d7ac5cbba9e704e0d26d8b515b371</md5file>
-<md5file name="cs.js">f5788fc7a0f1033f63da79e866548c85</md5file>
-<md5file name="bg.js">dcff781648fe33410c48967931017e2f</md5file>
-<md5file name="zh-cn.js">eb997b9d9f545d0e417ff6b6f835e1b4</md5file>
-<md5file name="km.js">4bb67bf400590e434860f08db98fa46c</md5file>
-<md5file name="sk.js">91dcdd9171330bf1fe2a68c75781cacc</md5file>
-<md5file name="vi.js">ba52be3319719dea18f13a00e186dd8a</md5file>
-<md5file name="tr.js">9636bdc181cbd89f1a3cf4a282309770</md5file>
-<md5file name="sl.js">abf3374cceab6e094a48b353980eced3</md5file>
-<md5file name="es.js">44d36c782ef3bd210e3880685b20d9ad</md5file>
-<md5file name="si.js">93d0d0a5c0f829d01b9eb2d4c53c6bee</md5file>
-<md5file name="ms.js">783c6fe18aa38884e7308148bbf8a284</md5file>
-<md5file name="fi.js">b740cd6c774df05b4c924cf0f42b5b13</md5file>
-<md5file name="en-gb.js">fec94613049294e536d3e4950fcc3dc7</md5file>
-<md5file name="en-ca.js">6e1d92ef906107124621ff5c541de67a</md5file>
-<md5file name="af.js">fe8c72747f740588ef09b74c3445f444</md5file>
-<md5file name="ug.js">0087533a55047448cc2fa174051fc466</md5file>
-<md5file name="fo.js">f51640826ce645e6ecca937c5375c92f</md5file>
-<md5file name="en-au.js">8e92714657b67232e7bf174630be8a8f</md5file>
-<md5file name="fr-ca.js">4fb44b127ca30b811af3230159460f1c</md5file>
-<md5file name="bs.js">9536a078ef77aaff6c4db757e42efa78</md5file>
-<md5file name="ar.js">59cf7de75879f055850f81ac48274d20</md5file>
-<md5file name="en.js">702865c717365f25ecfc9de0fb865db5</md5file>
-<md5file name="sr-latn.js">9a0637260928288f4da423cfe527c2ce</md5file>
-<md5file name="fr.js">6bf8714bb481b3511e42d6df5fac1ca7</md5file>
-<md5file name="zh.js">96ad06e54daef6725d2dcbac1cb90a42</md5file>
-<md5file name="fa.js">9f7dd0c7c5c0bd66ee32e2514ffc028a</md5file>
-<md5file name="ca.js">26070cb9eb665c0c4758e0c5b133c283</md5file>
-<md5file name="pt.js">a29cc607c2198093066636105cfc0007</md5file>
-<md5file name="el.js">83e90e9669014742999eda33936167e6</md5file>
-<md5file name="et.js">5e46c8a04b9765c01d9386747fdd1bae</md5file>
-<md5file name="nl.js">91e3aed95d9eaff1179580268c668ad8</md5file>
-<md5file name="gl.js">c45e4464772f1cbe27d9f14205f6f6e9</md5file>
-<md5file name="he.js">f4aef961a8314c0aa559cd22ac8bed79</md5file>
-<md5file name="ro.js">1f8a24000c0a982800c0eacd1c33c5ff</md5file>
-<md5file name="sr.js">40e0aa210fca124252fed7e441e300fa</md5file>
-<md5file name="gu.js">25a7e146d67fd2720cb6ea10cd21bbe7</md5file>
-<md5file name="bn.js">a405f65660a02154d2cd022d21a8f816</md5file>
-<md5file name="eo.js">a6bb840e317357a855e7970e0197aa49</md5file>
-<md5file name="hi.js">eca38931fc26931ac695d6ebc8b1d470</md5file>
-<md5file name="no.js">28367261bd0930840d0fcd563299da80</md5file>
-<md5file name="eu.js">761e3fc90e2c4675f75bccba7ba9aa5e</md5file>
-<md5file name="uk.js">bc29ea9a5bddfc52d70edbf81d340186</md5file>
-<md5file name="hr.js">f712b155531e614b9fa18a9e99fef5d4</md5file>
-<md5file name="pt-br.js">3d980736a5e30ffe613edaecb0c60f72</md5file>
-<md5file name="de.js">42c4aadf8ac6bf0b4784adb23eb04d64</md5file>
-<md5file name="mn.js">0c554ac4e30366566ca47133eb068084</md5file>
-<md5file name="sq.js">d155b3131c606911d779b87473fd9a65</md5file>
-<md5file name="ko.js">5660169f40ed8a6aea22a178864198b9</md5file>
-<md5file name="is.js">5d7e7485d9832042e8da7a420663ca26</md5file>
-<md5file name="it.js">305778bf22b14d32832b1bbc5c167c8a</md5file>
-<md5file name="th.js">1859d4258d23bf9ab57ceabad5ac0a07</md5file>
-<md5file name="id.js">d77471c5ba4d6b0aafd041b366c089cd</md5file>
-<md5file name="nb.js">5c389e5703aaa95c615231c9be30fc33</md5file>
-<md5file name="ja.js">bd97c5e7cd704fe29b5036cc107c4e12</md5file>
-<md5file name="pl.js">5ae453453198e5403d1673163e468224</md5file>
-<md5file name="ku.js">d5135f45590ce7bf7d0c902d13f6a2e3</md5file>
-<md5file name="cy.js">e398480ad7b1c3e8e923368923e344d2</md5file>
-<md5file name="hu.js">34d7f6131031d76a22cc316260cc65af</md5file>
-<md5file name="ka.js">b2eb70b61009ce12a9b62f89d1853728</md5file>
-<md5file name="da.js">26617630e0aa5bbcc4c28872dde424b4</md5file>
-<md5file name="mk.js">93cd0b3f03eb9bba86c79509810f9dcd</md5file>
-<md5file name="sv.js">44ba81bf0aafabbcb26d420346eb959c</md5file>
-<md5file name="lt.js">103d78b92539c7b44f22373d06f1d767</md5file>
-<md5file name="ru.js">40883fb361fc5de2a4fffc39e1e23cac</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastefromword" >
-<md5file name="plugin.js">18a80c4fdd6880bd19be5a10dabdb048</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley/icons" >
-<md5file name="smiley.png">1a40d00a1e7269a80e45923f67e9f5a8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley/icons/hidpi" >
-<md5file name="smiley.png">8fe98c303f4642d919ff7dae5b865d27</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley/lang" >
-<md5file name="lv.js">4dca28d39c883c265755c22e7e862688</md5file>
-<md5file name="cs.js">39f190894937b1f55e2df3276bafc229</md5file>
-<md5file name="bg.js">ca553844064d55a929c15b6206b7dbd4</md5file>
-<md5file name="zh-cn.js">f0ea23df199cedcd015f754e67ee2f2d</md5file>
-<md5file name="km.js">d8185b6534928c2c27c3bd7842311735</md5file>
-<md5file name="sk.js">dae98fa4994180c0131251b81b438490</md5file>
-<md5file name="vi.js">370181d8cb642b916a09caf945a749e1</md5file>
-<md5file name="tr.js">0627099bbe99859c133d245036920813</md5file>
-<md5file name="sl.js">f839cf450e568e6a4c8e1db0a0b20fbe</md5file>
-<md5file name="es.js">53217574d8abaaeb0ba5f788407c0ab9</md5file>
-<md5file name="si.js">e862dc16e5bee2285354de770dfd072b</md5file>
-<md5file name="ms.js">acfcaf6448c9c745959e0499b08ae7b1</md5file>
-<md5file name="fi.js">3c5af3d9b79fcfbfcf538056f88d9eed</md5file>
-<md5file name="en-gb.js">4736c55401db3a05ae6dbabf89133295</md5file>
-<md5file name="en-ca.js">a64c683f02af2f644d924d8655bf44c8</md5file>
-<md5file name="af.js">6b809b39a0a46a9169f4db859663ebb7</md5file>
-<md5file name="ug.js">ef358d40f208b4cd2e2fa4da1ad9658b</md5file>
-<md5file name="fo.js">a5c88f09491161c3ad9497c4ae263a7e</md5file>
-<md5file name="en-au.js">69b9fc03b4785ac400d4193253b4c6b6</md5file>
-<md5file name="fr-ca.js">6c479c20624e3d0a3e58ece610af52cd</md5file>
-<md5file name="bs.js">12c6543aa68a7bd8150fbe9e3b083608</md5file>
-<md5file name="ar.js">46dc66cf74689c57a92009a07ee976a9</md5file>
-<md5file name="en.js">5689663399bc0b6fec8c107866c65b26</md5file>
-<md5file name="sr-latn.js">a630f0b0df9868af5a0346f21bd7c0e9</md5file>
-<md5file name="fr.js">0da2ac555bb4df1b95c2482e19b3f69d</md5file>
-<md5file name="zh.js">1d3260c0a3818c10ad13891dace380ba</md5file>
-<md5file name="fa.js">cad168632e760ef4b052c0cfd9eedd7c</md5file>
-<md5file name="ca.js">217f4354eba011a1904c9fb62467b65a</md5file>
-<md5file name="pt.js">ef843e2689c25c68466d6daf39c9d4b1</md5file>
-<md5file name="el.js">61a9a7f7d8571f8c11083c0942cfc265</md5file>
-<md5file name="et.js">163a8358ec114acac5a2672ad4e37b2e</md5file>
-<md5file name="nl.js">1545a5c74ed936a58e33dbad6a62ad29</md5file>
-<md5file name="gl.js">d98d2d362d93297d345ad4bcddd51792</md5file>
-<md5file name="he.js">e8e8b9986faaecb3e83d01ef2689f087</md5file>
-<md5file name="ro.js">835772ea7744a5e195ac52ce27d761a3</md5file>
-<md5file name="sr.js">ef403b20c412cb9e46e7859831d7abee</md5file>
-<md5file name="gu.js">909b41ad567a4d741b3813fb2955989a</md5file>
-<md5file name="bn.js">f6b5953439b5be09382bfcf678c66c7f</md5file>
-<md5file name="eo.js">50a82501f08a3723ec41f8f6a7f79247</md5file>
-<md5file name="hi.js">88ffc04442458e992cb35ef5be8211c8</md5file>
-<md5file name="no.js">0fd72a4260a889cfc3e5a8e0e4ef1892</md5file>
-<md5file name="eu.js">faf618f0b2d199a246b4b922414e3d4a</md5file>
-<md5file name="uk.js">8d1422de45899d51c8bec323da009715</md5file>
-<md5file name="hr.js">b73ea3bb9c43b5cc8980633dc76a87c5</md5file>
-<md5file name="pt-br.js">372850e153891cfaf349c7411f953146</md5file>
-<md5file name="de.js">f3ea58b26b1ab4a3be56ad0f921c0b54</md5file>
-<md5file name="mn.js">3b83879c6f64194a2e0fbb919055180c</md5file>
-<md5file name="sq.js">c274b99226ddc7e2db79152f57889501</md5file>
-<md5file name="ko.js">8b2a47a567e56d47dc1f88db9a9f9c1a</md5file>
-<md5file name="is.js">e2cbb038a2453d9e740d702133f36cef</md5file>
-<md5file name="it.js">961666e004788edf9e751d461350f27a</md5file>
-<md5file name="th.js">46d32f0f94c4524868004e728a51b132</md5file>
-<md5file name="id.js">c5ea60aa79a8809a9e778625d2d18d8f</md5file>
-<md5file name="nb.js">210567b7ca250975dae6a2f1a4787a23</md5file>
-<md5file name="ja.js">94b1498250d321469a72fb0c71ba012a</md5file>
-<md5file name="pl.js">14d8f11646b47766ecff76b6feb93ece</md5file>
-<md5file name="ku.js">0b88fbee7a06b6cf2d661089f1b32afc</md5file>
-<md5file name="cy.js">0ceaba2ab6237ab2d1d4ac619b89b2a5</md5file>
-<md5file name="hu.js">b2c53dac18aaa333ea14b46f51b18151</md5file>
-<md5file name="ka.js">b58b6bc08c4bdc1f3e229745feeb0572</md5file>
-<md5file name="da.js">8403e47adcd8429e23eeaf6cb6b15bc5</md5file>
-<md5file name="mk.js">cfa2f5fbdd3d8ab3d1249bd758c7a2eb</md5file>
-<md5file name="sv.js">340190ebea4fca04c19e01deb0d3a823</md5file>
-<md5file name="lt.js">5942cbd2a0ac63ae845307fa087e2f7e</md5file>
-<md5file name="ru.js">40c1b14bf010d494817bbf3816790be2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley/dialogs" >
-<md5file name="smiley.js">199ceffa80f4db1e3e7fabf74bdee32a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley/images" >
-<md5file name="thumbs_down.png">4ab54cbceb647be525aab443e86249a2</md5file>
-<md5file name="tongue_smile.gif">6d10783b288fe54b3e50f828992d0745</md5file>
-<md5file name="shades_smile.png">1415a98b14e5cb9afe748c674bae25af</md5file>
-<md5file name="regular_smile.png">030c9387085c667ce9014f8f17dc0908</md5file>
-<md5file name="omg_smile.gif">a19b5c291ea2495e2432a27a54353606</md5file>
-<md5file name="whatchutalkingabout_smile.gif">25b67ef8c30f1bd5520742c943025538</md5file>
-<md5file name="regular_smile.gif">1805943c3c41a0aece435f873cb86703</md5file>
-<md5file name="envelope.png">95cffdc2b1e72e9b8baae9e00aff08ec</md5file>
-<md5file name="heart.png">e38d30e0053468a2789af17d38f9c444</md5file>
-<md5file name="thumbs_down.gif">457178c3e1e5a10eeab9f0f920df8926</md5file>
-<md5file name="heart.gif">93e6fff7bffc55153d9c2859ac28e48b</md5file>
-<md5file name="devil_smile.png">ae7676fbfbf82586f79479b56756cce1</md5file>
-<md5file name="thumbs_up.png">11510868ce8e8ed585a6ad563ee22a9d</md5file>
-<md5file name="shades_smile.gif">0813f938cc098ddc751cbef6bdecf7cd</md5file>
-<md5file name="lightbulb.gif">3d403bb930953d625b0a771484cc85e9</md5file>
-<md5file name="cry_smile.png">e24a05f22bf8f9d91fb17899c3ac56fd</md5file>
-<md5file name="angel_smile.png">94ac3c915312d3e4445343bc99be0c54</md5file>
-<md5file name="thumbs_up.gif">0c7f9b9d0824505bd03fa82b4cc753a3</md5file>
-<md5file name="sad_smile.png">a23c0a40efc09de6a7640b5d0d9f4bb7</md5file>
-<md5file name="cry_smile.gif">14eaed2d73022fca3bebfae0052b0c6b</md5file>
-<md5file name="angel_smile.gif">c4b9c95d9f742081196beb6e72ded20f</md5file>
-<md5file name="kiss.gif">a1fef4cefd9e43603349f8e4d9775029</md5file>
-<md5file name="tongue_smile.png">f3f0b68b3af528ca89254103743c048e</md5file>
-<md5file name="embaressed_smile.gif">166b5085bfb3eaa3d73326a8829a34b3</md5file>
-<md5file name="envelope.gif">640883a64b98eca9219958f0c9a3c777</md5file>
-<md5file name="teeth_smile.png">1b3f37880568ec36e07297ddc71e2baa</md5file>
-<md5file name="omg_smile.png">9683369b3890d4830e9e0ba0e65743f3</md5file>
-<md5file name="lightbulb.png">5da336a24e940842244ba5365f8f391a</md5file>
-<md5file name="teeth_smile.gif">fbcb93b073c2737f2238a68e0e8d173f</md5file>
-<md5file name="broken_heart.png">bd17ba6ddc0c45fa6b7b7dd3704a88d7</md5file>
-<md5file name="wink_smile.png">a8642b488c4247b15aa815bd0fb20c3b</md5file>
-<md5file name="kiss.png">a0bc93f53f35404900f567504449f73f</md5file>
-<md5file name="wink_smile.gif">b1f0a29724f70701011af095dccf9da6</md5file>
-<md5file name="confused_smile.png">68b71eb39de968b214aee59c7aee63f2</md5file>
-<md5file name="embarrassed_smile.png">746058795a92d2278489bdac1c9eb850</md5file>
-<md5file name="broken_heart.gif">82f4dcbc8b788985f547dccef636c95e</md5file>
-<md5file name="angry_smile.gif">10c1c4d475f9050f55a4f30d321f68c8</md5file>
-<md5file name="sad_smile.gif">3bfda8ed81210d7473e60dfd1c5fb2b9</md5file>
-<md5file name="whatchutalkingabout_smile.png">a6472d528369b797a46bfb37d6ed972c</md5file>
-<md5file name="tounge_smile.gif">6d10783b288fe54b3e50f828992d0745</md5file>
-<md5file name="embarrassed_smile.gif">166b5085bfb3eaa3d73326a8829a34b3</md5file>
-<md5file name="angry_smile.png">58d03455e940b51010a2a56a8cb04ef8</md5file>
-<md5file name="devil_smile.gif">e9421d09d8e14616be9571c92125933c</md5file>
-<md5file name="confused_smile.gif">71a6cf09e9f6d0f95ada2ec5d99b3865</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/smiley" >
-<md5file name="plugin.js">1ccdf2386a0f9ccdfb330c73d94e605e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colordialog/lang" >
-<md5file name="lv.js">00b40ae23c989caac858fb873d3ac124</md5file>
-<md5file name="cs.js">14faf3792bf93d633f5df02aad6030b5</md5file>
-<md5file name="bg.js">14f78c71cd3162d636189600d5f84974</md5file>
-<md5file name="zh-cn.js">5021762bbe4d4798fcb665a3d8d1af32</md5file>
-<md5file name="km.js">76768f4cd58c2c1843cd813359dc1c76</md5file>
-<md5file name="sk.js">df375804789f9690e28a249614ad7ba6</md5file>
-<md5file name="vi.js">b12ff5e4167d297bf133f2094bee6efa</md5file>
-<md5file name="tr.js">131e3c919ea28b49b7a6d9a65c78a4f6</md5file>
-<md5file name="sl.js">e9cadc621fc6628900ae43bedc2588c2</md5file>
-<md5file name="es.js">1ec75ac93040da667c202b28ef25c0ce</md5file>
-<md5file name="si.js">057e7bc9937cec27a5edfed1a42ac7c8</md5file>
-<md5file name="ms.js">11af3251e27f66c27515faf2f5230091</md5file>
-<md5file name="fi.js">8c06d1a432e946a46d36e2a0340621e9</md5file>
-<md5file name="en-gb.js">2e3d0ea285ae9017f538b7e44c937dec</md5file>
-<md5file name="en-ca.js">249da4d382d5c402d55e5f4226b49717</md5file>
-<md5file name="af.js">5e06642539e4c61baca4a653e4efccad</md5file>
-<md5file name="ug.js">f6717612edc2d0fee57a7383566834c1</md5file>
-<md5file name="fo.js">89bbd0ee8a97d0c98b41b3a8f391c99b</md5file>
-<md5file name="en-au.js">b368be2dddfe4e1cee45ccc0b6fdcf68</md5file>
-<md5file name="fr-ca.js">42aadd458f7a79453311bbcea86375b5</md5file>
-<md5file name="bs.js">5b4cfb1ba0b67adc7050fba492406cf4</md5file>
-<md5file name="ar.js">8d6c1bfdc8e23551b69c9ac0ec57e3f5</md5file>
-<md5file name="en.js">2bec7a43e0a9b86c1f4be7d637f509b6</md5file>
-<md5file name="sr-latn.js">f0413ffb9757b5e863a1f9253f0dc107</md5file>
-<md5file name="fr.js">83ce32f33027169c99c7c9ddbc0b2771</md5file>
-<md5file name="zh.js">36568775c9e37f9dfe71d9d29919e80e</md5file>
-<md5file name="fa.js">68727476ca31236f8df200932ebbc304</md5file>
-<md5file name="ca.js">4a03d1a28ec39d45f7b7bda42b6c0ff2</md5file>
-<md5file name="pt.js">150d7d0fdbdc7455bf6806dbd6ef8a4c</md5file>
-<md5file name="el.js">e87c11a090aa0ac30a05ac2245c19af4</md5file>
-<md5file name="et.js">05fa3667e7b38623db709904cd5d07d7</md5file>
-<md5file name="nl.js">f28187b54876865cb4c5f31f7fc2e33c</md5file>
-<md5file name="gl.js">cfb636eff493d1438720b919049bdc1c</md5file>
-<md5file name="he.js">13c7b52746b52a5fd50b680881b47fbc</md5file>
-<md5file name="ro.js">43b6bb71820d5c965140e62ab0b6c3ea</md5file>
-<md5file name="sr.js">6e77850fca8b589703d58a4045266d61</md5file>
-<md5file name="gu.js">0b8c38e9869d2009c9b4fafb5b1109d7</md5file>
-<md5file name="bn.js">d0d02638396f0ea62ef23688b1a9483a</md5file>
-<md5file name="eo.js">a719d20393cb1c8e6b40d96af550ebc3</md5file>
-<md5file name="hi.js">1ff2a2539b5b1cec552808f21f5a3816</md5file>
-<md5file name="no.js">9fc4893e57426d217821f655591eac53</md5file>
-<md5file name="eu.js">efd6769107962d232cbb8453379302ad</md5file>
-<md5file name="uk.js">f9fc5a95271f30728d96175e87dbb012</md5file>
-<md5file name="hr.js">e67871a9add3ef7ffbc50f6d6739ce5c</md5file>
-<md5file name="pt-br.js">2055df6f0dd7e414aa6a73601798c119</md5file>
-<md5file name="de.js">1a23745064a7dfeba86800a6e7545c58</md5file>
-<md5file name="mn.js">8f27ff406d99a4e69e7d53134a275d77</md5file>
-<md5file name="sq.js">1b463c26612a0c5bc7f6fc75eb01d946</md5file>
-<md5file name="ko.js">5037c3a630b41bc07fb3984bdadd1372</md5file>
-<md5file name="is.js">ea0ad12dfae55282afcea286dde41636</md5file>
-<md5file name="it.js">e17665b3b8e8142359d071a7422610cf</md5file>
-<md5file name="th.js">21c5cbf4314d815a0996789863c1d0af</md5file>
-<md5file name="nb.js">2c53f94fe98a68097223483ad95c9a12</md5file>
-<md5file name="ja.js">717845ad41a7329687625e3b84312352</md5file>
-<md5file name="pl.js">5bf6082634b5e94fd4681c219b7cc42f</md5file>
-<md5file name="ku.js">e1ce013fe04374129b55062fd7aece7d</md5file>
-<md5file name="cy.js">e81be4a426762dffe4ee817c9d29d5c6</md5file>
-<md5file name="hu.js">7ad9dd30a550dc372d944939e63367ac</md5file>
-<md5file name="ka.js">a82511d139f1fbad44748d7b0b0b3924</md5file>
-<md5file name="da.js">a053e427ed77db13e2aafb7525780c32</md5file>
-<md5file name="mk.js">dad1b372fa7c2fc8c7563747e36ce044</md5file>
-<md5file name="sv.js">635778eaa8fe3385e4955f11d78c8eea</md5file>
-<md5file name="lt.js">ad9b58ba80716a5302e96d49989d047d</md5file>
-<md5file name="ru.js">25f1cd2f6964253c2d1e62108eded2b8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colordialog/dialogs" >
-<md5file name="colordialog.js">37a5e104be6e4b2d95c862e1d0867c46</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/colordialog" >
-<md5file name="plugin.js">cf48ddbfd3ea5d66e3c67944c8da8773</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/language/icons/hidpi" >
-<md5file name="language.png">d3854403cf08e84d30463f89a32f2dc4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/language/icons" >
-<md5file name="language.png">c834d231620c7df3f385c3a49a6b3d46</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/language/lang" >
-<md5file name="cs.js">983729c2e3729c8a76110af3191cf532</md5file>
-<md5file name="zh-cn.js">d2fdf22855dfb470dd12a98d193b0294</md5file>
-<md5file name="km.js">37e189ba7e650c04a0ed30c447f123cf</md5file>
-<md5file name="sl.js">74c1560a1e90e3fd07fb62ec94853dea</md5file>
-<md5file name="es.js">ab8923da645d6abf8d6b1b1d29a67dce</md5file>
-<md5file name="fi.js">701c785c5095faef2d96dcf67f25a56b</md5file>
-<md5file name="en-gb.js">84bd4993d9940e95b43efb672703e508</md5file>
-<md5file name="en.js">63d15f15aef078f0b344588d6122bd35</md5file>
-<md5file name="fr.js">6c3864e371c0cf46cf9894192c93fd53</md5file>
-<md5file name="zh.js">758b08db561feca036035c0c2f8c486a</md5file>
-<md5file name="fa.js">74223e79d1cb08e07996a4d82cbf699d</md5file>
-<md5file name="ca.js">7194ff79bc8f0633eb12c043b2fae8f8</md5file>
-<md5file name="pt.js">4a01469a35089d4c0fe9b4dec861d481</md5file>
-<md5file name="el.js">4ae96a812d3347007b85c60b809b621d</md5file>
-<md5file name="nl.js">b9065e340d80545ffd52c987d6e1cdde</md5file>
-<md5file name="gl.js">7813b6214da575376a7226f33ca92d64</md5file>
-<md5file name="no.js">fb32dbc233692718ee8d705f3795818e</md5file>
-<md5file name="uk.js">a6056a5f565a5afe1125dd5ec345bbae</md5file>
-<md5file name="pt-br.js">d6162c59f219e35307890afb8363d931</md5file>
-<md5file name="nb.js">9fb7a245311f94cb5485d0716a91b46b</md5file>
-<md5file name="ja.js">04b885f006f73d99a0d14db935c649b5</md5file>
-<md5file name="pl.js">5a29a70d0cce273c9c7e763d73157f12</md5file>
-<md5file name="cy.js">d2139add9c63754cc9a46f8e87001b78</md5file>
-<md5file name="hu.js">7a6808af6ee2a7d55d4cfeeeacfb5613</md5file>
-<md5file name="sv.js">b1f41e4a0b970090882c46bfecccd175</md5file>
-<md5file name="ru.js">865c234fdf958ffd0a2d75df9d919c18</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/language" >
-<md5file name="plugin.js">0f205d1900bc5a85c83967b4ab2e88b4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/tab" >
-<md5file name="plugin.js">2932f3e33313df2fcb0c151e3423def3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/elementspath/lang" >
-<md5file name="lv.js">bf76bbe3bb9f4fa1f38c723472f0e17c</md5file>
-<md5file name="cs.js">892f495fafcb992cd6e250d16bd2005f</md5file>
-<md5file name="bg.js">16f07562ae67f4d23ec913141d96155a</md5file>
-<md5file name="zh-cn.js">8dfca1c2cd9749aedc6bd6a7a2028ca5</md5file>
-<md5file name="km.js">528bf5586e6dbb2a5befe26b2e40a51b</md5file>
-<md5file name="sk.js">468cb9134a7361314437e9805096279f</md5file>
-<md5file name="vi.js">17741b03432725359322e3824eb0365a</md5file>
-<md5file name="tr.js">c0d4092aeaa089311e571e1a8d1305d0</md5file>
-<md5file name="sl.js">b8df58fc0a4fbb24c541c5f33650ca12</md5file>
-<md5file name="es.js">41ff7f20d77fcd1896c013d78f062d35</md5file>
-<md5file name="si.js">2ed8327235a36f38ae84f04a134e2ed9</md5file>
-<md5file name="ms.js">88d4ee1abb183b534cff35c0d90c40f2</md5file>
-<md5file name="fi.js">c667376098bd057f286ad96a8be557b6</md5file>
-<md5file name="en-gb.js">5c92c9449da6c737a38452922b4bcaff</md5file>
-<md5file name="en-ca.js">a1163525e054dc09dea22027e5611dc4</md5file>
-<md5file name="af.js">dd0fe1770571a9dbd89ea429fcaace93</md5file>
-<md5file name="ug.js">4d4ee3f261ec6a4801269377ac754e9b</md5file>
-<md5file name="fo.js">dcc398ce47d249796a9541d2daf5977b</md5file>
-<md5file name="en-au.js">969853a18bc1c5a8fc1b6da66f46667c</md5file>
-<md5file name="fr-ca.js">900db2034b2d7a6184c7be13c86f2ffc</md5file>
-<md5file name="bs.js">dfa42d2c349eac38be7ebbf0b4d5ebf0</md5file>
-<md5file name="ar.js">cd82e20ad7bf0dbacd5bf56ade775044</md5file>
-<md5file name="en.js">404c2aca474520364bb6d7d95503d5ab</md5file>
-<md5file name="sr-latn.js">44a199bd8b6c8bae49426dd80fe68aa5</md5file>
-<md5file name="fr.js">b2ca0cd3a8d500830daf81940aa2e217</md5file>
-<md5file name="zh.js">f2a4457dfc4020bd6f86b614e72d64ea</md5file>
-<md5file name="fa.js">c5e753209040963031aa2ecb1967f844</md5file>
-<md5file name="ca.js">21fe0227445c576740c80171336e7140</md5file>
-<md5file name="pt.js">08889d90c128bc986e6f33daa81de111</md5file>
-<md5file name="el.js">fb24fe30463b754cad50ca0c8fb2a61a</md5file>
-<md5file name="et.js">6b32e52c1d8ae19f221e82b6658ec6ed</md5file>
-<md5file name="nl.js">590749d0bb4f01cbe9419fd575cf9bb5</md5file>
-<md5file name="gl.js">b3aa20154f2c168489a0f025845bcc8b</md5file>
-<md5file name="he.js">e508f520803b6a25c98ba5b50a7d2460</md5file>
-<md5file name="ro.js">25c804e7e9a20379225cb03cf159f37d</md5file>
-<md5file name="sr.js">4def3bd05c46b7c544700cceff48f2b6</md5file>
-<md5file name="gu.js">001d8342078c130a854a5fc2ba3e5fe0</md5file>
-<md5file name="bn.js">800cf8ce3aa715c4832c37048f5f2ef2</md5file>
-<md5file name="eo.js">c780ee5145fa21c13a14c081142c368c</md5file>
-<md5file name="hi.js">35ee66e976455f7945b047682f1f4734</md5file>
-<md5file name="no.js">a6f41e9047f174358364f070a1c9e085</md5file>
-<md5file name="eu.js">7374905c6244ad66e8c96f5ce3b87019</md5file>
-<md5file name="uk.js">4b7860f21d571f2b011e9c8bc3bd934b</md5file>
-<md5file name="hr.js">0316f35bcd972c39bec12bf39ce8b848</md5file>
-<md5file name="pt-br.js">0b9d4f88bd9f89b40fa1de3a70d7b9be</md5file>
-<md5file name="de.js">8338e554a27ff4cabf09b75f4a437571</md5file>
-<md5file name="mn.js">a279995f8747fb597f20adb229f458f0</md5file>
-<md5file name="sq.js">345004bd7d7b7b965c0ed874b11890cd</md5file>
-<md5file name="ko.js">94872f902b930385cef1169767d5e627</md5file>
-<md5file name="is.js">39a5d39d564daceb561f5fbd44f618e9</md5file>
-<md5file name="it.js">9bc50b2be0ce0833aee8d4112c0dba90</md5file>
-<md5file name="th.js">b1e11a91a505d57a8c67502b914114a9</md5file>
-<md5file name="nb.js">1f1438bf681d3639cd200349e199a321</md5file>
-<md5file name="ja.js">3bfbe8485673e6d5182ea4356bcbc69f</md5file>
-<md5file name="pl.js">c1cf7cb1fcc86adf53b852c5c386d80c</md5file>
-<md5file name="ku.js">51fa2383746497ffd868f2c41a9b9916</md5file>
-<md5file name="cy.js">82ecae8ae815f91e8ed31a153326d8ac</md5file>
-<md5file name="hu.js">c13d065a12474a08b3c1967dd412d3bf</md5file>
-<md5file name="ka.js">269de249b303ae7df6f86174fb84ebe5</md5file>
-<md5file name="da.js">7b58466546979c617c630397758804bc</md5file>
-<md5file name="mk.js">27fb09849811598bc2a9d1ac4d256388</md5file>
-<md5file name="sv.js">46a74789d877e3031e3681dd8a79c95f</md5file>
-<md5file name="lt.js">0e73a8e6e29fb65e20302d7b14932373</md5file>
-<md5file name="ru.js">c53c492d3c9cd649e87097aaf3cbf1b1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/elementspath" >
-<md5file name="plugin.js">d24b9af5ca5c9d722db69d1af4e3db57</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/fakeobjects/lang" >
-<md5file name="lv.js">d66d1e7b6a373eff09f71de6991e22ae</md5file>
-<md5file name="cs.js">14c68008d94f6d3f61f6cca02cd8ede8</md5file>
-<md5file name="bg.js">cff68e4998b2a8c3981c8f9f09fdcb66</md5file>
-<md5file name="zh-cn.js">0bd95e0651a2ac03255ce19543439bf9</md5file>
-<md5file name="km.js">58738e91241853705cc89688d779ef67</md5file>
-<md5file name="sk.js">adcdcbb989ce471063d6f5f213298417</md5file>
-<md5file name="vi.js">f44e973ae2e5ff86237b9213617fb822</md5file>
-<md5file name="tr.js">af688b341e9fc7a2a4b0bdcdb3b0c40a</md5file>
-<md5file name="sl.js">8a7ac96d733528b9117bb34ceabe2afd</md5file>
-<md5file name="es.js">b3ed6329af1133bc6f138980929b687c</md5file>
-<md5file name="si.js">de3db480653c80d66ac3617983c562d5</md5file>
-<md5file name="ms.js">5c3ef78288b759fbac600079943871d3</md5file>
-<md5file name="fi.js">4a2724f5b8fcdc7f0302aa9fd153da63</md5file>
-<md5file name="en-gb.js">e36abbb542a080efdc037ab5b5892b30</md5file>
-<md5file name="en-ca.js">a623c86e9add2870c0590afc5f949bbd</md5file>
-<md5file name="af.js">bd237395ea9a7a64f1d09260d5ec9fdb</md5file>
-<md5file name="ug.js">ae0879a75ca966dc197b8402a2162ab5</md5file>
-<md5file name="fo.js">e2c4206b699b0a3d50cc11518fdd8b80</md5file>
-<md5file name="en-au.js">661750ea7a3b438f1f1f9827f3aeb993</md5file>
-<md5file name="fr-ca.js">4186064e46463e1ba447f4e87197db6e</md5file>
-<md5file name="bs.js">295385b41cf155abeef31139bceb22af</md5file>
-<md5file name="ar.js">86f70ad4a8940724e813be06c1813ef6</md5file>
-<md5file name="en.js">25c1bd469f655f5bdc5b1c4e460adda3</md5file>
-<md5file name="sr-latn.js">ac510a2014fe6e9033bd65e3ca7d5997</md5file>
-<md5file name="fr.js">09c77138ec31fa2c72384cc2ca27d9cf</md5file>
-<md5file name="zh.js">1decef4f4c89fe4c950038cf39bbb76c</md5file>
-<md5file name="fa.js">b2fdf0078f2ddef407d32a20f3c55cdc</md5file>
-<md5file name="ca.js">1d5084fdd27662a5828dba33edeecaa6</md5file>
-<md5file name="pt.js">65d9564a4cac04972338da24811437c3</md5file>
-<md5file name="el.js">24b661483ef46368bf5c3d10b7d22165</md5file>
-<md5file name="et.js">9c880cf3060d4146f93941b2a1c4df9b</md5file>
-<md5file name="nl.js">8863eda18d8d7d8086441d029e8e0cf8</md5file>
-<md5file name="gl.js">00e1d7fec8ca8316f2d85a5a4b33fc44</md5file>
-<md5file name="he.js">d01ae13baeed029832b3718143e8f4a0</md5file>
-<md5file name="ro.js">3dd88d8c7a7aba125c3fd8fbdcd2ea73</md5file>
-<md5file name="sr.js">5fb5bebcac4f2685fd9f8849dcf9b812</md5file>
-<md5file name="gu.js">a736f34d542d40c887cb595ee83c5a1f</md5file>
-<md5file name="bn.js">24341da6955553e788c3a2564584758e</md5file>
-<md5file name="eo.js">2f3d776b19bc39e993ce41c859839286</md5file>
-<md5file name="hi.js">22657bd140ac2202e2bf629bae03fa5c</md5file>
-<md5file name="no.js">1177f3b2688e025a98c04ab77b0c0e1c</md5file>
-<md5file name="eu.js">16d98685acb2d7bbbf8bd790722cfc8e</md5file>
-<md5file name="uk.js">0bc16529a959eb0dde97ebf8fb17fd0b</md5file>
-<md5file name="hr.js">4f2daf7c00acab18efd05da010c78361</md5file>
-<md5file name="pt-br.js">df22a0b9c83465670f9d1ebf7632229d</md5file>
-<md5file name="de.js">8ab1f8fadb4c9f8816d055e7658a5e6d</md5file>
-<md5file name="mn.js">1d98cd5f2f25e0591c11e41e2afc9c23</md5file>
-<md5file name="sq.js">738fc1d9f4eb5c4ab9cbee2b95ab7ddb</md5file>
-<md5file name="ko.js">0ab38b3075fb9d3c9515862de613aa16</md5file>
-<md5file name="is.js">114bcc9d8d93b490e63fdf91e3acb551</md5file>
-<md5file name="it.js">3cef8a6e019d9c765e0fdadc3de9e2e6</md5file>
-<md5file name="th.js">fc4ca09947a8b6a942ce2c1c8161d117</md5file>
-<md5file name="id.js">dd8f860c6ef110e9de82e37fa8afb184</md5file>
-<md5file name="nb.js">9c173f277ea1483d1280e8c155a61bee</md5file>
-<md5file name="ja.js">5febfc5e97dc2aeb2557b4de112db24e</md5file>
-<md5file name="pl.js">726973b7ca45c04bb222e1664e8ed817</md5file>
-<md5file name="ku.js">45026a8580338b72244a03ad96e26ad8</md5file>
-<md5file name="cy.js">058041c70c87b2173b351b0c7995688b</md5file>
-<md5file name="hu.js">25642619bfad6452050065405f23ce57</md5file>
-<md5file name="ka.js">13e67c57c640c49533942da28ceca657</md5file>
-<md5file name="da.js">ea15b2fbcaa5a42956607cd8021faab4</md5file>
-<md5file name="mk.js">99479c0e5007fa0a86496e2373b0cae7</md5file>
-<md5file name="sv.js">bdb1c8f55784f7d8f12d7092db1efe9c</md5file>
-<md5file name="lt.js">0dce132c559ca76638e532472b6370de</md5file>
-<md5file name="ru.js">a69ea93297fe0452c1426b611515fd7b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/fakeobjects/images" >
-<md5file name="spacer.gif">df3e567d6f16d040326c7a0ea29a4f41</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/fakeobjects" >
-<md5file name="plugin.js">15fb5433cf915aa2be398666363c8ca7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/bidi/icons" >
-<md5file name="bidirtl.png">86e1b26fb22425ba2e5c88d450ebe4c2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/bidi/icons/hidpi" >
-<md5file name="bidirtl.png">cb4357c41b35084a10ea91b6f0cb8873</md5file>
-<md5file name="bidiltr.png">6c11a20d3f2aee3890d163c714db76f4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/bidi/icons" >
-<md5file name="bidiltr.png">a5b115effaf63469aacc14b2f367d3e6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/bidi/lang" >
-<md5file name="lv.js">652b4c23d9d52bfbb97a5f772dc026f3</md5file>
-<md5file name="cs.js">1e30220cd1c4d69488b59242a05788c1</md5file>
-<md5file name="bg.js">fb5fc514e5132640de7feecf3f6cc7b3</md5file>
-<md5file name="zh-cn.js">6a5c8cc05b333d062f330d2430493bab</md5file>
-<md5file name="km.js">f1fe5e39f45acb48c465866c5de3602d</md5file>
-<md5file name="sk.js">da084fb806ccfab38f46e2c981a21a67</md5file>
-<md5file name="vi.js">e7118b21bf601e8cd63f97302d7ecdd4</md5file>
-<md5file name="tr.js">e4a3547bfda39ce77369ba0ac530cde9</md5file>
-<md5file name="sl.js">799271e4b2e7a15bbdb7c125b0ea9f5d</md5file>
-<md5file name="es.js">18a99293f81a734a2086c0aca26c47d9</md5file>
-<md5file name="si.js">b2f6e0e312e6f4fd395ed5eaf5ef3d13</md5file>
-<md5file name="ms.js">a44de256251de559963b599511a5e0b6</md5file>
-<md5file name="fi.js">c13ae1d3a6da0bb2aa323e186dd1d386</md5file>
-<md5file name="en-gb.js">31b0fe94d3cbd166075e6cd8ad01330e</md5file>
-<md5file name="en-ca.js">a4acafa29fa8877e29fd2089359efbac</md5file>
-<md5file name="af.js">73f30beba864e65933a6520d1dfac7b4</md5file>
-<md5file name="ug.js">a63c5a0d19a26ecf48648e9f258d9ba1</md5file>
-<md5file name="fo.js">95a0103c5fda9a5b38a8e5ce90de43f4</md5file>
-<md5file name="en-au.js">6f628d6a5f2c1ec73d7b740d0dc15693</md5file>
-<md5file name="fr-ca.js">1f61c0621f1b3c205552e2c7e5b71636</md5file>
-<md5file name="bs.js">7f6a06b4122d989a3649f3e91bd988a5</md5file>
-<md5file name="ar.js">f14c76da432414dcc70dfffe6617b217</md5file>
-<md5file name="en.js">c547ff36adf3f10501629741f159e236</md5file>
-<md5file name="sr-latn.js">d9e276fa43be5a8ad48c94a4f7089fcc</md5file>
-<md5file name="fr.js">945573cd76cd8640a58536054efe5517</md5file>
-<md5file name="zh.js">e5931e3a09b21d75678e74b4ab9ea607</md5file>
-<md5file name="fa.js">c622148ceda49da4faf56ae49a65336d</md5file>
-<md5file name="ca.js">e5d9746d761dac5450cdfa82fa59ad99</md5file>
-<md5file name="pt.js">c09ade70ef2e492c1c5220aad72a2bc6</md5file>
-<md5file name="el.js">cfa19319b2fbe6f87683e5c743d0905a</md5file>
-<md5file name="et.js">846a1dd4a26752300cc4239b4c84b864</md5file>
-<md5file name="nl.js">53e6ea416c84879576b4881f9266067b</md5file>
-<md5file name="gl.js">85cb52767e4db268c9ab7c4b703821fb</md5file>
-<md5file name="he.js">a296e114b598141152fec8be15f50e54</md5file>
-<md5file name="ro.js">cd3627c392a4241a15c6e8965a6b2eae</md5file>
-<md5file name="sr.js">3cf27c83b3f3dbe7a4a6f8ab17570f1a</md5file>
-<md5file name="gu.js">bfc88159098d140c910c1a0eeec04fa1</md5file>
-<md5file name="bn.js">5731622ee20f93f4b44c3770f8f71c05</md5file>
-<md5file name="eo.js">c3c1e5581c85375440d5009e6d54d049</md5file>
-<md5file name="hi.js">c39626c5a90ae521a6d553f950c5ac5d</md5file>
-<md5file name="no.js">6d8d9d876bbfb7d535a2ad37fa3c288b</md5file>
-<md5file name="eu.js">2a8b760d0700c3abe671145d267cff38</md5file>
-<md5file name="uk.js">3e7fed8b0a65773cb17750532994b395</md5file>
-<md5file name="hr.js">daec3ec1f80e3ca8da943a8ff57eddcd</md5file>
-<md5file name="pt-br.js">8dcee24049e4b61868645a49553171e4</md5file>
-<md5file name="de.js">8998061b08a4497932e91f87a821e01c</md5file>
-<md5file name="mn.js">bafe6e2b89c924169cb82ab47315e0e7</md5file>
-<md5file name="sq.js">e5a1edee079f2cca0f52f7a80476b8f3</md5file>
-<md5file name="ko.js">b062eb07fa84ad1e905ab499398ccf14</md5file>
-<md5file name="is.js">ec2661871e8f1903ec84fbc469dc809d</md5file>
-<md5file name="it.js">10f34289c45d690c9b22b4f4ca69389b</md5file>
-<md5file name="th.js">0d7b25603ef778a20dc8fbb403d4e905</md5file>
-<md5file name="id.js">de9e574c0b44c4719bb1f83578b815e6</md5file>
-<md5file name="nb.js">e672e525da9adefc7be55534c15a4d77</md5file>
-<md5file name="ja.js">7ec306afaca26ed3c3000ae5c5aa8b8f</md5file>
-<md5file name="pl.js">8a99077724ed433d911e3287f33fe5d0</md5file>
-<md5file name="ku.js">e587ce3591e950f68827b7677d27b516</md5file>
-<md5file name="cy.js">26bbd172479da8b66150c1a86afdc0fd</md5file>
-<md5file name="hu.js">e0b0924f8c81c13dbbf9aa3e6671268f</md5file>
-<md5file name="ka.js">04353f0157697b48f3f3d673258081ac</md5file>
-<md5file name="da.js">e4e8236aca00672d547d1f3613e48d3c</md5file>
-<md5file name="mk.js">487a96cefc1be133cd1a3a4979d1e182</md5file>
-<md5file name="sv.js">d2beeb43f28ab2fb956d236a053cfe49</md5file>
-<md5file name="lt.js">6b2b4d990bdcd974683755a444f0fb89</md5file>
-<md5file name="ru.js">ad4ea14b69345cc7e9091041ac77fca8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/bidi" >
-<md5file name="plugin.js">e3f2dc130c8b1ae2713f49bed2ee9d11</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/menubutton" >
-<md5file name="plugin.js">f295e37b60cca30b2e38c0b01189ca36</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/basicstyles/icons" >
-<md5file name="underline.png">ec0e0682c767499a01f763530606916f</md5file>
-<md5file name="bold.png">83c4afa5a7847671031e28e86833add2</md5file>
-<md5file name="subscript.png">68617e25f0ec7dd701dd59a5656d9434</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/basicstyles/icons/hidpi" >
-<md5file name="underline.png">b2a5bc92369b85991380abc7ba8ed9ff</md5file>
-<md5file name="bold.png">86ada72552105dc8605abaddda6359e6</md5file>
-<md5file name="subscript.png">f518a701ab61f6e1faf7b64a38cdc111</md5file>
-<md5file name="italic.png">14afc6144d0b738020f86f26530f5aed</md5file>
-<md5file name="strike.png">391730a825903621dedd1167f0089813</md5file>
-<md5file name="superscript.png">dd21483e8e30fe859c606e175cf816e9</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/basicstyles/icons" >
-<md5file name="italic.png">441c1e7d8779e39d3ddd5a21ef184cdb</md5file>
-<md5file name="strike.png">abf053577f529a4fdca7ae577e6cdb90</md5file>
-<md5file name="superscript.png">64aa12fb017e3a9b0bfc5a49fd73f8fb</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/basicstyles/lang" >
-<md5file name="lv.js">b5648c532a8c2d01b20f4fa70523613c</md5file>
-<md5file name="cs.js">fda34032c64605a76f5eec353889b28a</md5file>
-<md5file name="bg.js">9e9680de469660972b639a94f801b473</md5file>
-<md5file name="zh-cn.js">e274f1f497f272001e290079cd057dd0</md5file>
-<md5file name="km.js">3d7dc891dd108074b057aee494c9f16f</md5file>
-<md5file name="sk.js">68e9d18cdd5f9a0c5535bc9d75f7e55f</md5file>
-<md5file name="vi.js">9b96558d6967fee68825aa7f8bf30a6f</md5file>
-<md5file name="tr.js">82373d35e673d674a37b202ecc836f75</md5file>
-<md5file name="sl.js">604860eda6d86d052407127da3555b0d</md5file>
-<md5file name="es.js">30f0d6af687195da02d62f2a1d7d4277</md5file>
-<md5file name="si.js">6634d42a866e9d1865a813520c322557</md5file>
-<md5file name="ms.js">184914a2152e0deff0a864793c1c4772</md5file>
-<md5file name="fi.js">0e5d1aab952117e0b2bc3a68b6547a98</md5file>
-<md5file name="en-gb.js">ef8602fb45d26e9c585b6f83d014a467</md5file>
-<md5file name="en-ca.js">a0a207416e883b5590e61c0c69f95838</md5file>
-<md5file name="af.js">e6b9dd5fd0911c0055118d0da4cf6bff</md5file>
-<md5file name="ug.js">ca5480758aa1dbb0afdf65b4429857d8</md5file>
-<md5file name="fo.js">9671727fd23c033251676c862a1905b5</md5file>
-<md5file name="en-au.js">90fd4bf888b0ac7f996ecc5d416ee6e2</md5file>
-<md5file name="fr-ca.js">d8f8e228928d660038783a51593a7e10</md5file>
-<md5file name="bs.js">1c38d071cd56bc2c8a7c041bc523b96b</md5file>
-<md5file name="ar.js">3dbe4c6f39b6aaa0400182e83b32e952</md5file>
-<md5file name="en.js">0981ce1b80a31d780650cac53be31aec</md5file>
-<md5file name="sr-latn.js">1e7c9458e6d8747b4f113f4a115edd81</md5file>
-<md5file name="fr.js">13492d0e4e3327c50611de639cca4212</md5file>
-<md5file name="zh.js">648d23549f0c9ffdd907ba5288573ab9</md5file>
-<md5file name="fa.js">b3ea90b5ebc790f7c45b0e6eec843bc4</md5file>
-<md5file name="ca.js">c08e4efbd854113a3ea6e134b9a6fafe</md5file>
-<md5file name="pt.js">8bfa9092cfe223046e08e52e73c0a961</md5file>
-<md5file name="el.js">06fccb32b8a54154fe1550bbe266eba6</md5file>
-<md5file name="et.js">be1123f843fa34b639adf5fc0ed6e207</md5file>
-<md5file name="nl.js">dd5892a8544b3e8b00ebe1ea35c0e3a1</md5file>
-<md5file name="gl.js">cfd65facfc85f50bce8561162bc9847c</md5file>
-<md5file name="he.js">962d6ba633f1681a012235ff79aa6953</md5file>
-<md5file name="ro.js">b53338983384427805961c97ae6594e0</md5file>
-<md5file name="sr.js">2867007a78f3f919f590d8791a8c3592</md5file>
-<md5file name="gu.js">4c5ad546597e328452f5fde9f63b1c74</md5file>
-<md5file name="bn.js">f5fcd399a62088eb1625b6d2124fabcf</md5file>
-<md5file name="eo.js">87b8149044a984eae6fc351ddfd89cef</md5file>
-<md5file name="hi.js">daf8bd522c595c9524dc81a0c1ae692f</md5file>
-<md5file name="no.js">8435905698e56cb4343a7aca9d56f8ea</md5file>
-<md5file name="eu.js">34c172bc776dc6e2fd7a0400f90acf5f</md5file>
-<md5file name="uk.js">ad657c22136c9403be51eb81180ac630</md5file>
-<md5file name="hr.js">3e3b3127dba8c3d4d23f15570dc9bca0</md5file>
-<md5file name="pt-br.js">f53576f970cd091b07516078ac9aa0cb</md5file>
-<md5file name="de.js">b032e9d995bff30f0e2c7c5300507b33</md5file>
-<md5file name="mn.js">cd6bbcc0ae36e31539559dc2661fce08</md5file>
-<md5file name="sq.js">2ece63d1f03462376dbfb520a38cc0bc</md5file>
-<md5file name="ko.js">5088de94dbc97c7e41956211f81c796c</md5file>
-<md5file name="is.js">9d636e84bafcfd303708a5a946ba7f0b</md5file>
-<md5file name="it.js">7f7f0f4172d4ce2f5520b91020a06d4c</md5file>
-<md5file name="th.js">4edc60b7914df59a495749d51757ca34</md5file>
-<md5file name="id.js">7062e01b179df61d63d268c66a9f46b2</md5file>
-<md5file name="nb.js">70536fe0b9146c54d6785650174528eb</md5file>
-<md5file name="ja.js">879890853daded7283a92e712b16eec1</md5file>
-<md5file name="pl.js">63032b8081ce5a2b366dc9d6b6595deb</md5file>
-<md5file name="ku.js">d7b9023040d400148647b1ab461f04d8</md5file>
-<md5file name="cy.js">82c4f23da497d5e455883095774b8e74</md5file>
-<md5file name="hu.js">22a8703a365355fe4150e8305abe8aa6</md5file>
-<md5file name="ka.js">f08f2e3366c04ba0104285dac3731337</md5file>
-<md5file name="da.js">20816917ecd2e4dcb9775493400bfc17</md5file>
-<md5file name="mk.js">2cabf886429af06001b048dcdd2191fa</md5file>
-<md5file name="sv.js">ba6ee7d2e2714cfc26ba032e53f418b0</md5file>
-<md5file name="lt.js">c2e8095b6a0a8afda92cd11d30eb6a8b</md5file>
-<md5file name="ru.js">df7b2860d7e2dddf4c38ddd17cf88009</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/basicstyles" >
-<md5file name="plugin.js">38b2c0ea8a8c30d66d17bf0e524a8a1d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent/icons" >
-<md5file name="indent.png">e186a374ae736b0a383642251246a03d</md5file>
-<md5file name="outdent.png">39c21946426cba4b60723422377e42a4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent/icons/hidpi" >
-<md5file name="indent.png">8aa196e802d6f72bfdefa3b5e8809f16</md5file>
-<md5file name="outdent.png">4063d77c780ff6b5b79ec48debf060ac</md5file>
-<md5file name="outdent-rtl.png">fe69c569852a83a358f823da141e53c8</md5file>
-<md5file name="indent-rtl.png">c777aa8285dc3b9d75301b7a17a6a23c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent/icons" >
-<md5file name="outdent-rtl.png">47c80f0d87725ea324804bfe3f63ebd4</md5file>
-<md5file name="indent-rtl.png">3ae9af24508fe9ffc8664852465d57e3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent/lang" >
-<md5file name="lv.js">6d58a503c85896bf06c411f3d95eccbf</md5file>
-<md5file name="cs.js">4ce4b06d71ba3840a33a4dcb9735072f</md5file>
-<md5file name="bg.js">e7848d2a0fe7eecfe333449d7b3c4f71</md5file>
-<md5file name="zh-cn.js">3698319e7851b8854df81e47b6917dad</md5file>
-<md5file name="km.js">8fa3e78c68fb039161dc55bbb3f0f746</md5file>
-<md5file name="sk.js">bedeb3d6dc2b6517985393fe933f3f23</md5file>
-<md5file name="vi.js">7fe75636cb1cec491dbee64b3756cfda</md5file>
-<md5file name="tr.js">0215a306552933b811bc7930ce19116c</md5file>
-<md5file name="sl.js">4c22f876df5b8465dd209a5840a30bb7</md5file>
-<md5file name="es.js">1addc62af2f559c5abd2ad53f5bff10b</md5file>
-<md5file name="si.js">d3cc8565b641fdfafcdcae9af57c8d59</md5file>
-<md5file name="ms.js">a86b0ad84cb3ce606036c81e5a242503</md5file>
-<md5file name="fi.js">42bf4f22044979c4f2a5da2227b4db95</md5file>
-<md5file name="en-gb.js">1f4fac1c26ce40f9f1e6139aa5ee1bb9</md5file>
-<md5file name="en-ca.js">688e479abbaaa0165afd0e3c9e22c298</md5file>
-<md5file name="af.js">3af14c6c1dc916c1f1adedf692f7ae89</md5file>
-<md5file name="ug.js">f4a939c3c11fd0e67994c11f3f1634a9</md5file>
-<md5file name="fo.js">554ce7dad70ccf08345739bcdb79416f</md5file>
-<md5file name="en-au.js">37bb7c54512900c38f6ef1fc5c0f5ea3</md5file>
-<md5file name="fr-ca.js">00560e1c0b81e49d69f6029799a6dd72</md5file>
-<md5file name="bs.js">72154b5948886cd1eeb03e270f87926f</md5file>
-<md5file name="ar.js">4e79ca699e46300843fe180d5f295846</md5file>
-<md5file name="en.js">3cdcddc70edb076a0e93f0df0094070e</md5file>
-<md5file name="sr-latn.js">897bcbbda4f5cabb498fac37c621d7e4</md5file>
-<md5file name="fr.js">18e15b3477d8965aa8cb41d553d6847e</md5file>
-<md5file name="zh.js">79a28bff4f078b130bec0e27567d3185</md5file>
-<md5file name="fa.js">7bb5f909b31b4a14985abdbb84b80832</md5file>
-<md5file name="ca.js">faab6d83f12ab9cb40aa95160986e981</md5file>
-<md5file name="pt.js">e8e6b1d6c936cf4d7149500198a7dac3</md5file>
-<md5file name="el.js">2011a9c889baf4243f192e02dd63aafb</md5file>
-<md5file name="et.js">a6d5abf2300c19feb8afc7ac17de9614</md5file>
-<md5file name="nl.js">611d0184bd3366554cb614c0378fd4bf</md5file>
-<md5file name="gl.js">903de14ab89a0fa174f58ef73ac64235</md5file>
-<md5file name="he.js">e90b617bcbc89e5d827fd687e1d7b353</md5file>
-<md5file name="ro.js">a351f05bda1c6a42dc480283d96ea60b</md5file>
-<md5file name="sr.js">7fc052151fc84448599edcbf1f583e2e</md5file>
-<md5file name="gu.js">3b481f8b7853c799adabdace62e15be3</md5file>
-<md5file name="bn.js">aae36c3dfac9b0f559326afc8c4bef61</md5file>
-<md5file name="eo.js">b1dfed485aa260d46c31c32af3cf16ad</md5file>
-<md5file name="hi.js">d6af3c9d9b3d1bfcdb39aa457460b728</md5file>
-<md5file name="no.js">42afecb8bd19da681aaab1da177cb2fc</md5file>
-<md5file name="eu.js">176311151547c8c1fa7791e1f96d7bba</md5file>
-<md5file name="uk.js">11ddd08d54fa8b02bb74540d832dfc99</md5file>
-<md5file name="hr.js">2ad3fa79c3095329ae66eed2711c54b1</md5file>
-<md5file name="pt-br.js">3d968921d0f53e26e9113ee6489a4211</md5file>
-<md5file name="de.js">15aab5dd87e29c927b85328dea18d614</md5file>
-<md5file name="mn.js">1e4fa7fbc1072ba458b641f11d742a12</md5file>
-<md5file name="sq.js">6fc13bae80547277c7899ead77450acd</md5file>
-<md5file name="ko.js">6cbc423fb38b55cf80483bae13f0daf3</md5file>
-<md5file name="is.js">421afea8d2305fbdb5b21202d1d3daa4</md5file>
-<md5file name="it.js">a5988e9c564c0a0d6580ee763de7a6ee</md5file>
-<md5file name="th.js">397b59991b940fdbc8e0bf3e76241e55</md5file>
-<md5file name="id.js">d162715195dff0e91e06442ca54d517f</md5file>
-<md5file name="nb.js">f5165766cc964ab024eccb8fd65f98a9</md5file>
-<md5file name="ja.js">7d22d4c6cc8ad8b5110eb2a4a178f3a8</md5file>
-<md5file name="pl.js">fc1d9bc8b43e2454db7260a063882308</md5file>
-<md5file name="ku.js">c27094395975d1d5fee8107e06d0e5ca</md5file>
-<md5file name="cy.js">74e7461fd3c4b7edf35bcf567f864bc7</md5file>
-<md5file name="hu.js">81e725d20e4792d0c832934e0b4d1768</md5file>
-<md5file name="ka.js">cdd5842f24fb7eee1fde3405b5db54a3</md5file>
-<md5file name="da.js">33589ae7a0009cb26a8515630ac73304</md5file>
-<md5file name="mk.js">c50d66b224e0149040bae1471d3a2ca1</md5file>
-<md5file name="sv.js">1a8a32edbc28dca8ea58f0dcb7bb3aec</md5file>
-<md5file name="lt.js">2ac655d2f1be28fd2933cae2d40e2313</md5file>
-<md5file name="ru.js">552c968ad48444896dfdb713f9d1a950</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent/dev" >
-<md5file name="indent.html">d4ebc7510d06937836f84961c55be335</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/indent" >
-<md5file name="plugin.js">1f744b872301f7a1ce8e969262a87dd4</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/dialog/samples" >
-<md5file name="dialog.html">f585fa2017c232c9700d71dbd2bb8be2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/dialog/samples/assets" >
-<md5file name="my_dialog.js">492da0005fcf299ba996cc907a422986</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/dialog" >
-<md5file name="dialogDefinition.js">cb801c21cb362fee6567539612849b27</md5file>
-<md5file name="plugin.js">80c26f6c43e856fe7168ca0dfa5eeeb1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/icons" >
-<md5file name="anchor.png">22925cbc2dff31926cd9465a2981f8f3</md5file>
-<md5file name="anchor-rtl.png">09559453b8c02af20aac399b753968d6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/icons/hidpi" >
-<md5file name="anchor.png">1b0cb4219e01fc2496d44fbac2e278c7</md5file>
-<md5file name="anchor-rtl.png">e76d8bec66c15432a6b952304c074bb2</md5file>
-<md5file name="link.png">91258c9b718d472e07d903906ee3b1f5</md5file>
-<md5file name="unlink.png">277d433baac7350184bd1d27775eeb24</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/icons" >
-<md5file name="link.png">f2999d6a0d2a72f23ba2a011b0846a51</md5file>
-<md5file name="unlink.png">1b82e756cead981f5cdc488918e11fa1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/lang" >
-<md5file name="lv.js">85fc3d042805f52560599736ce53229d</md5file>
-<md5file name="cs.js">7e97d995c0bc1eeaa6227f89d5cfc8d1</md5file>
-<md5file name="bg.js">c06f1639ee703e071ef61bdbb9edcd47</md5file>
-<md5file name="zh-cn.js">236a7b4215aca10bc6be201f98ff3c52</md5file>
-<md5file name="km.js">8096ff02b1136d9b70f3122341aafb61</md5file>
-<md5file name="sk.js">0e2386bbef9aba32802ac8238a13bdf9</md5file>
-<md5file name="vi.js">8d6314b0b5e183d1e6a60e9abc4d845e</md5file>
-<md5file name="tr.js">d07ce5609796ed3bc9bc7d8c2d72b9b4</md5file>
-<md5file name="sl.js">29f6507d7963489bd1684d9593be1e77</md5file>
-<md5file name="es.js">0d7b688e37f7c9b66889b28c3036ed7a</md5file>
-<md5file name="si.js">69fc7b288867415dca33e4715a5adfe7</md5file>
-<md5file name="ms.js">2603b84d027eb3201c80708c55d98d13</md5file>
-<md5file name="fi.js">99b0c2fe3c7073747f8a3cae31dd75bd</md5file>
-<md5file name="en-gb.js">bfcd460941562acd26e4b19c3a939412</md5file>
-<md5file name="en-ca.js">1aeee31eff564011fc6673c33e6a9f26</md5file>
-<md5file name="af.js">1658cdddbddd82cccff688ee77ecaf26</md5file>
-<md5file name="ug.js">de115279927e56ef815339cb99f9292d</md5file>
-<md5file name="fo.js">0a0b0631d374810a566f573a4c6ef37b</md5file>
-<md5file name="en-au.js">3f4a0b5d4e4d8822bfed5f719add6dea</md5file>
-<md5file name="fr-ca.js">f3cd22ad24a4b750c26b731c0967f8c3</md5file>
-<md5file name="bs.js">2eba45864ce36777660fc9c55e81f313</md5file>
-<md5file name="ar.js">6fcaaedaae5ca0bb2c33a0cb75195498</md5file>
-<md5file name="en.js">ca894957777341db0a46ad65f0b17899</md5file>
-<md5file name="sr-latn.js">874aa73f22f608126d7a7daa7daed272</md5file>
-<md5file name="fr.js">4bec359ec721b127e605b42ceff25de3</md5file>
-<md5file name="zh.js">14bc1051609c9908935ec63e13972ce0</md5file>
-<md5file name="fa.js">9f280a0ef12999a092b8fead18bbf2c8</md5file>
-<md5file name="ca.js">9f7a17952bfaa8b14217ac459e56b646</md5file>
-<md5file name="pt.js">11ac09b3175c0f8c4624f7df4b1b1610</md5file>
-<md5file name="el.js">a1e884c44c8af17e0033bfbf52a3c265</md5file>
-<md5file name="et.js">b1be257fc722e3e3596c0f317b63f15b</md5file>
-<md5file name="nl.js">fc2ec595b049b11e847426aa304ddc6d</md5file>
-<md5file name="gl.js">a688766970c6db6b1174b6323d38f9bb</md5file>
-<md5file name="he.js">916e03582ddfffe4ae5fe61ed431e980</md5file>
-<md5file name="ro.js">be3698bf6b260b81ad7240c97b4c9cd2</md5file>
-<md5file name="sr.js">2e6ce4c96a92a2ed648368466e9b5bad</md5file>
-<md5file name="gu.js">de8fdcf97c9176b0e6e2c693715b3d36</md5file>
-<md5file name="bn.js">520fb861891fab9c9aeb827d4cd9ba91</md5file>
-<md5file name="eo.js">59e2ddf05ce1238f5728934ec71d9f39</md5file>
-<md5file name="hi.js">6ffc7e1ab00dd8f065533835571b9204</md5file>
-<md5file name="no.js">8adb620acea122426191ffa879be2438</md5file>
-<md5file name="eu.js">26433836c9dbbd151abe4127257f295a</md5file>
-<md5file name="uk.js">7b8cee0bd7e729f54636d0dc48461efc</md5file>
-<md5file name="hr.js">453bd3f4f91a2f2f8dc61aeeb4b314ed</md5file>
-<md5file name="pt-br.js">c68e25a630bab4d2c2fd75ddef45ed63</md5file>
-<md5file name="de.js">00d4313b95251a7965c14eacfe769609</md5file>
-<md5file name="mn.js">657fef17266d26b9679388339e014046</md5file>
-<md5file name="sq.js">8c7a4bb7e9d17c712d10f4138da654a2</md5file>
-<md5file name="ko.js">ee5c87f15da9bac553f91dab15ebb04f</md5file>
-<md5file name="is.js">1e8e0e7ad08b71bbc48db286f3886736</md5file>
-<md5file name="it.js">adb01d6c3aba25bdb17a9dc4d93d088b</md5file>
-<md5file name="th.js">4db19fbc3e739f179cf2a814140cb0ea</md5file>
-<md5file name="id.js">cdedcd32f0a754d4380d6357c10638ac</md5file>
-<md5file name="nb.js">330876559f315db3896c19fdeb8db7f1</md5file>
-<md5file name="ja.js">1ff4b830345bc173512425d495499dfa</md5file>
-<md5file name="pl.js">b3026695d2a8b011ce6d8361d3352ffe</md5file>
-<md5file name="ku.js">e7f647e0f4c1ddfebc5d1b1b658e51ad</md5file>
-<md5file name="cy.js">ca2bf6af4d525857ce2d6be3da3de793</md5file>
-<md5file name="hu.js">845216f4e3e20a728963213df76fbec6</md5file>
-<md5file name="ka.js">120a01765437f41df6541f8c4f9c825d</md5file>
-<md5file name="da.js">deb7252f24c6e276c8d13ce4c1fbc274</md5file>
-<md5file name="mk.js">e200ede1b9fff1f440393e77bf9e4e54</md5file>
-<md5file name="sv.js">5761622a2bc204edec20925d46c7e742</md5file>
-<md5file name="lt.js">51bab5f9665d36447329a8d7bf2f704e</md5file>
-<md5file name="ru.js">4b89e81a200cc23ff2cd386504a907a9</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/dialogs" >
-<md5file name="link.js">d6540fb9a5fd8f71cceb9d70d1c02725</md5file>
-<md5file name="anchor.js">62aed7c6fc9afdcf4f48f6c28be286b1</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/images" >
-<md5file name="anchor.png">b61cb3c36c0363df2b0ebf91a8b814a0</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link/images/hidpi" >
-<md5file name="anchor.png">5ff2733687ed023674151563277f9606</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/link" >
-<md5file name="plugin.js">330586373bb6e563f84cb097a13608ba</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/enterkey/samples" >
-<md5file name="enterkey.html">a1d6a4f36840ae414110a5c38d8918da</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/enterkey" >
-<md5file name="plugin.js">7e342b5d0366633fcf187ceb12ae71bc</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/icons" >
-<md5file name="textarea.png">cf8960630fd8d5d8a0dbfe3cc1cee4e9</md5file>
-<md5file name="form.png">45e670edcafe630482b368aae3c6c35a</md5file>
-<md5file name="hiddenfield.png">5b4053803e467cbb0478b65635a4e5ea</md5file>
-<md5file name="checkbox.png">54a2d2266bd12c7fc1e7734af9f1dc2f</md5file>
-<md5file name="select.png">b91fc1fcf228706e250e51d10220e10a</md5file>
-<md5file name="textfield-rtl.png">a58a10e05b789f241187b1006369699b</md5file>
-<md5file name="textarea-rtl.png">dd29581a73e753192f4dbf04f74bf738</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/icons/hidpi" >
-<md5file name="textarea.png">b604706f8290dc2c1ad866158096dbc2</md5file>
-<md5file name="form.png">a47285e8056bd94994455c9568d9a06a</md5file>
-<md5file name="hiddenfield.png">662f2bbce147ef131b715a7ed63c6e5e</md5file>
-<md5file name="checkbox.png">4b8da5f77c31f0951abf9435c1a38dd2</md5file>
-<md5file name="select.png">754f06e960fe37a104640aaf1abccf00</md5file>
-<md5file name="textfield-rtl.png">c126b5531833a5c22877a89965351495</md5file>
-<md5file name="textarea-rtl.png">f2c8ba56a466020fa2a741346e038a4f</md5file>
-<md5file name="imagebutton.png">00881f0b6ab571ca8597f5bc67cfc1f8</md5file>
-<md5file name="button.png">6c84866f916ce8ae2a791fde01ffd762</md5file>
-<md5file name="textfield.png">c126b5531833a5c22877a89965351495</md5file>
-<md5file name="select-rtl.png">34a1d6c4f58e1a3317873decd61675fa</md5file>
-<md5file name="radio.png">65602c9e887f68bbb45eafca24e55c03</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/icons" >
-<md5file name="imagebutton.png">2a3b6994a34aa08e1498614ce0e10819</md5file>
-<md5file name="button.png">e689320fd984d21795a04255fbb7dc72</md5file>
-<md5file name="textfield.png">a58a10e05b789f241187b1006369699b</md5file>
-<md5file name="select-rtl.png">6a57578a3a7037d8534bf04867407f9a</md5file>
-<md5file name="radio.png">bbbde17b0f3619486ef63a60f42632ca</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/lang" >
-<md5file name="lv.js">727c747367056852713f2b48fe53c1ec</md5file>
-<md5file name="cs.js">22a02121c600bc405c09922e67669dd1</md5file>
-<md5file name="bg.js">9e2903286b57a62c10ed5cba13a145da</md5file>
-<md5file name="zh-cn.js">f25537156afccc498651cca80653bc1e</md5file>
-<md5file name="km.js">c4474420362ccb81e28d4c5d396a974c</md5file>
-<md5file name="sk.js">956143bb0094112c6bd7ada797769f38</md5file>
-<md5file name="vi.js">4af94d5bdb7445f5c1455525fa7a62a6</md5file>
-<md5file name="tr.js">2bf7122c99b995086352e4f5eac031b8</md5file>
-<md5file name="sl.js">9355ecb8ad755e35cf0d906c8a465c30</md5file>
-<md5file name="es.js">8d29804923af78a0f08d313dbfdb0ca0</md5file>
-<md5file name="si.js">69b71ce05c903e216985aa9fc96fdcf0</md5file>
-<md5file name="ms.js">1fd4473d532968de389a013d36f2a914</md5file>
-<md5file name="fi.js">84dacd07224a53e620f85d73fbf823e1</md5file>
-<md5file name="en-gb.js">3a6259971dddce3b5f86e1c1f601d2de</md5file>
-<md5file name="en-ca.js">f07fd40e9f0077c6061735334e821a12</md5file>
-<md5file name="af.js">e4107bf5f6c3285c0fc82216bb1ebab3</md5file>
-<md5file name="ug.js">1a44bb2817f115f6bf09b61e427874b2</md5file>
-<md5file name="fo.js">fed13cdc809292d38bada26c3910819a</md5file>
-<md5file name="en-au.js">447be9a5f4e25c354c3909903958455a</md5file>
-<md5file name="fr-ca.js">7b71d5f1df04ff8392feca405e30c6b7</md5file>
-<md5file name="bs.js">9da73a507611f6af7ebe245ee18ec2ab</md5file>
-<md5file name="ar.js">86890967051f85f1036c09ee102383c7</md5file>
-<md5file name="en.js">1a0e873aebac4c801ba0fed76aad5356</md5file>
-<md5file name="sr-latn.js">ce1968612d19b12dcaa0f23d2c706b12</md5file>
-<md5file name="fr.js">0aed04b86a560ab648c192cb9394f5f5</md5file>
-<md5file name="zh.js">3725dfdb6e00fd0e4d228795cc0076d6</md5file>
-<md5file name="fa.js">556faee4f11b76b177670129f265f32e</md5file>
-<md5file name="ca.js">c7c3c86b13013ddafa7d90ef7829ee29</md5file>
-<md5file name="pt.js">b0bdb73b954927ab13d03cec657b37db</md5file>
-<md5file name="el.js">549e960585234537e6edfb8efedee332</md5file>
-<md5file name="et.js">5112d3d0e6b168205f1415c5560ddcee</md5file>
-<md5file name="nl.js">ed6373c1cf9664f89677f1473bde78e0</md5file>
-<md5file name="gl.js">5b0f43fb465391007323fc5c51150bdd</md5file>
-<md5file name="he.js">9b2244878e75c71967bf01f2dd217966</md5file>
-<md5file name="ro.js">d3649532a1f1d2658612b9a2438d1f3c</md5file>
-<md5file name="sr.js">99d015c5245fef946e83c7fd88babb6b</md5file>
-<md5file name="gu.js">f46713c1c4436a3d990c5cd84ad30408</md5file>
-<md5file name="bn.js">3c0855eb04dbae353c6df0b3693fe665</md5file>
-<md5file name="eo.js">82c923a6d8eac43529db9454b6896da0</md5file>
-<md5file name="hi.js">b2ad24ba470caf1822a033068c2f5d04</md5file>
-<md5file name="no.js">2955312fb19060fa52335738166dab24</md5file>
-<md5file name="eu.js">64922684ecbbd977ff4a62dc3defdc29</md5file>
-<md5file name="uk.js">70128a5a069c6b8bb3e28b0b78152367</md5file>
-<md5file name="hr.js">f2405f4b1ed3fa5cef58bc9b241e1c7e</md5file>
-<md5file name="pt-br.js">d2fbebcb7ac9df6a712fad7542d93246</md5file>
-<md5file name="de.js">43e63cc0ab2b1bc17b9a1fd8ca5b36b2</md5file>
-<md5file name="mn.js">91e57c2a6ca916abfb93ad816ddd282b</md5file>
-<md5file name="sq.js">9888c7ab412bad56a50d6a546dd2e626</md5file>
-<md5file name="ko.js">c55a4c1fe097d828d7bd557bf7af3b25</md5file>
-<md5file name="is.js">08385f3ce4a8944aa1add96eee4423ce</md5file>
-<md5file name="it.js">c51c27077b88205e6c2e9a48951134d1</md5file>
-<md5file name="th.js">2c135f756f61df947e60011e91dadc17</md5file>
-<md5file name="id.js">5cc925aa61a6685427d8ba500f60fe6b</md5file>
-<md5file name="nb.js">c35abec32cac88c8f99563d57fe72e19</md5file>
-<md5file name="ja.js">de190041813ba9927ac49ae4fe5f453d</md5file>
-<md5file name="pl.js">1778b1eb3ec6b1be10c911d90bfc94ea</md5file>
-<md5file name="ku.js">95f8ae53a869fd085673a4784152f98b</md5file>
-<md5file name="cy.js">874cd0d750097e4388bf080d4605a14d</md5file>
-<md5file name="hu.js">4aff18a10cca1c7494bc0ae2d4543bed</md5file>
-<md5file name="ka.js">43284e48689e1bfa47a7defc8ca917e8</md5file>
-<md5file name="da.js">dca7b982f3b3a0b6b7114bc235183406</md5file>
-<md5file name="mk.js">dcc52b5fcec6dd9a750706a183d2077f</md5file>
-<md5file name="sv.js">34be78b149a33a71840589c3161b5b32</md5file>
-<md5file name="lt.js">ded3536eb6bd8367ddd587208fdba17b</md5file>
-<md5file name="ru.js">9c7f8976a8811574572cb539951c3e4d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/dialogs" >
-<md5file name="hiddenfield.js">6a4e6aba870e354e6d3ebfac7c01f0ff</md5file>
-<md5file name="form.js">351cb9766dc5162cd586485546608283</md5file>
-<md5file name="button.js">2b3c7c04fd04dc7a09bb983fd580ff38</md5file>
-<md5file name="checkbox.js">68ae2d02f1e21c856b4cda0f13c8fd3a</md5file>
-<md5file name="select.js">632e4ba7dcd3de3168feb70553e922b7</md5file>
-<md5file name="textarea.js">f76e2f239d6971bc47a058bc15305298</md5file>
-<md5file name="radio.js">d8e7d709b1d1fd9959705811453bcf90</md5file>
-<md5file name="textfield.js">b3b0f9faec2fc85f3fbac8baa7d6a9a6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms/images" >
-<md5file name="hiddenfield.gif">c724101436b085bf318e695fd784d658</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/forms" >
-<md5file name="plugin.js">e7da2db71fb15e252c37925c2445b363</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/div/icons" >
-<md5file name="creatediv.png">ae55a1eefe734127c79202bade1c9bf3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/div/icons/hidpi" >
-<md5file name="creatediv.png">b7150383ae7d33277b6edced137d386c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/div/lang" >
-<md5file name="lv.js">3fcb4612fa389fad0b849b042dbaea31</md5file>
-<md5file name="cs.js">7995bec1a02a24ab6e41d21460bcd169</md5file>
-<md5file name="bg.js">810c0081713130c8d25b1bc3509fbdeb</md5file>
-<md5file name="zh-cn.js">fcc020b590c8a0a4da3d3d757d630eea</md5file>
-<md5file name="km.js">719c7c6de3c772441eedf0663abdd7b4</md5file>
-<md5file name="sk.js">3dc1fe6ae24d64bd1036739dc56f39be</md5file>
-<md5file name="vi.js">c2d23d0ec20e54c789b69f95b297de10</md5file>
-<md5file name="tr.js">4257c313773aaf9f703b7409ebefa893</md5file>
-<md5file name="sl.js">3cc9b54cb0b7df0b963e6e58ec1980d8</md5file>
-<md5file name="es.js">df0f43fb589f6ce9e938c77297202dec</md5file>
-<md5file name="si.js">754d4d0d76b3805edc8d64c3a145d116</md5file>
-<md5file name="ms.js">b922a2e97ea572db7617252a5cb09016</md5file>
-<md5file name="fi.js">b52f589bf618a0ec290822065475236f</md5file>
-<md5file name="en-gb.js">a798a3c77764bbc441792cb1dea86375</md5file>
-<md5file name="en-ca.js">d21c3990b2f101e0d9fba427358fed01</md5file>
-<md5file name="af.js">5442cb7e20921a65b3f4024ea2fabfdb</md5file>
-<md5file name="ug.js">b07a19b877060edad71d0c8133c9c563</md5file>
-<md5file name="fo.js">bac76324c1ff893480227d0ce85193d8</md5file>
-<md5file name="en-au.js">4ecd2458c4065de9d5052f58d486237e</md5file>
-<md5file name="fr-ca.js">879e016db1327a5325c54a04a05047aa</md5file>
-<md5file name="bs.js">a0541e0740c2520523ca6a8ec5f827c9</md5file>
-<md5file name="ar.js">8e4174f9bdbf487e91f73fa5cb07907c</md5file>
-<md5file name="en.js">36df037980205dfe059f1fd7308f6864</md5file>
-<md5file name="sr-latn.js">2734646aaa561ad0ac8ac3dfd0868b3a</md5file>
-<md5file name="fr.js">64ae30b6e476762eeb8995f0689190b7</md5file>
-<md5file name="zh.js">d1a2397cdb479777687296695e06c51f</md5file>
-<md5file name="fa.js">2ba61c1133bcbdd5bf4d7de05064606e</md5file>
-<md5file name="ca.js">9c2b43af488aa616084e49439c55da0f</md5file>
-<md5file name="pt.js">dfd9488d1730bdef5e7e4651691030ec</md5file>
-<md5file name="el.js">d096e3503e71e0114b7ba5b821e1a2de</md5file>
-<md5file name="et.js">1659023218e51017e544ad4e537d9b18</md5file>
-<md5file name="nl.js">e0ae50e17fcd29b137569250bb3040b8</md5file>
-<md5file name="gl.js">994f4907bb14f448ac3a44568a751000</md5file>
-<md5file name="he.js">bcf08a6544003c46643fbc2a6ebb3812</md5file>
-<md5file name="ro.js">4b892ef95ba0feca4d59f4469a4ce3b3</md5file>
-<md5file name="sr.js">a1d88eb55e84dad93be065cc40f8f43b</md5file>
-<md5file name="gu.js">3a7ecb8e2c75c7fb6be8a15fc4fdb908</md5file>
-<md5file name="bn.js">ba90e42ef3b6b88f452c3a3d466fa2bd</md5file>
-<md5file name="eo.js">9e9b473214c639b310e3e80ee37d1e8c</md5file>
-<md5file name="hi.js">77798a72efca8c59d3d3103ffc1826aa</md5file>
-<md5file name="no.js">4c616984a8663592b3f72f8e917524a3</md5file>
-<md5file name="eu.js">1b773b463b76d2d74594e989b2209449</md5file>
-<md5file name="uk.js">d6b65c66164af0579ccdc3472fa91299</md5file>
-<md5file name="hr.js">26fb46a804553e04d411e0f603562d4c</md5file>
-<md5file name="pt-br.js">280a87a8f05d376f5d4f56933214e292</md5file>
-<md5file name="de.js">fcdf4de995727c4d106e5cfaf62c7384</md5file>
-<md5file name="mn.js">e5e56d3950a1f3f6d90e003bf0d7e068</md5file>
-<md5file name="sq.js">2819ae3efa4e379c614ef1d36278e295</md5file>
-<md5file name="ko.js">bd5e00c03c3549fb769e326633fe1960</md5file>
-<md5file name="is.js">3eb009619122994be49a5f3716e95326</md5file>
-<md5file name="it.js">e41a061acb148287e1f8c4fdc3a16571</md5file>
-<md5file name="th.js">2eb10e54d58683e54999b0aa87dc3a85</md5file>
-<md5file name="id.js">e97c0fbe9869a8f6a9d7f9866b0a60e2</md5file>
-<md5file name="nb.js">70340cd23778a77a387dd8798c2f9fed</md5file>
-<md5file name="ja.js">ddb63fc46f59277036603cef21dc94c3</md5file>
-<md5file name="pl.js">58447b5980f81822e013c53a69d55d7a</md5file>
-<md5file name="ku.js">9ca4d349ff39a9d000bdd45b4e754b98</md5file>
-<md5file name="cy.js">65c18a93c9c296130fc6ec1f039a2c1f</md5file>
-<md5file name="hu.js">7381e1c8a64778c83b9f8feafa31524f</md5file>
-<md5file name="ka.js">e27ac27a64c55cf2a628ee39c711c28c</md5file>
-<md5file name="da.js">fae881ec38165f31f2514ab8d0caa21b</md5file>
-<md5file name="mk.js">cb24ca767a4f89f10142f9972bd9b6e7</md5file>
-<md5file name="sv.js">67bbb73728d892af28f3d8a26429395c</md5file>
-<md5file name="lt.js">86b24af6f0386af9f1e1bb941d2003c7</md5file>
-<md5file name="ru.js">e1f548d95e7fb382a5b2ee9c9fa38b5c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/div/dialogs" >
-<md5file name="div.js">640fe591e3695d8b47d0555cb7c44770</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/div" >
-<md5file name="plugin.js">4bf47715be8a8ebfcb74483d37bc8927</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/filebrowser" >
-<md5file name="plugin.js">88a813c2a45d0c8ce12eda52f36f26d3</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/dialogadvtab" >
-<md5file name="plugin.js">e39dba8d7b8dc4617bd3a92bbd643207</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wsc/icons/hidpi" >
-<md5file name="spellchecker.png">70ab052ed51dfdad78f49615a6f69e60</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wsc/icons" >
-<md5file name="spellchecker.png">254df5a7ff156ec65a3997a119999809</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wsc/lang" >
-<md5file name="lv.js">5da383d5cab8d9acaae132e642e39806</md5file>
-<md5file name="cs.js">ec381e415072fac0d6eebbfaf9d6e62e</md5file>
-<md5file name="bg.js">c91e8e3ade1afcc630e27827d98879c4</md5file>
-<md5file name="zh-cn.js">058274a5eeceb30f11a79ffabed1d96e</md5file>
-<md5file name="km.js">73f148f84d8e97c7db6657fc3f537f2d</md5file>
-<md5file name="sk.js">3211b9b5fa8c83ba6cae6de02cbd503c</md5file>
-<md5file name="vi.js">59e1c8f8a6212947de946d9fda42a390</md5file>
-<md5file name="tr.js">a46b031738dfd4a8c8b3a9eda141dd99</md5file>
-<md5file name="sl.js">2d6819315f6c713d88daebcb6e35d7ad</md5file>
-<md5file name="es.js">3c33182571d240666416d01fdc898b44</md5file>
-<md5file name="ms.js">6afd922cf25edfba298730f0e3009d10</md5file>
-<md5file name="fi.js">7ebe3f9dee233b617e2900493fca3da1</md5file>
-<md5file name="en-gb.js">3347f3116c68b1e588aa95385ef18b4c</md5file>
-<md5file name="en-ca.js">053355dcf7473b91b68957d14591b448</md5file>
-<md5file name="af.js">fabfb09387164d3bd931bcb1d873bcbc</md5file>
-<md5file name="ug.js">1c14e4c0d88f9e322a9115f774cf5369</md5file>
-<md5file name="fo.js">1f2b53e20a6d5de24335cb6ef91554d0</md5file>
-<md5file name="en-au.js">971704fe6ae22d9c55ba03719ac35221</md5file>
-<md5file name="fr-ca.js">68a6512fa5235743cb2e1d17c7ce8b18</md5file>
-<md5file name="bs.js">0277ea9fbedf49ac49cf2d3bac63d541</md5file>
-<md5file name="ar.js">6f51a68280927c57c9b896922d178acd</md5file>
-<md5file name="en.js">e249d7912bf80bbbbf6c3606ddfa5205</md5file>
-<md5file name="sr-latn.js">2f7a31c1060cd0e183470a37139a04b4</md5file>
-<md5file name="fr.js">db8aeeb94562d6f90b79fbc5d7ad706e</md5file>
-<md5file name="zh.js">e72e2b1b569dada123db580105ba8263</md5file>
-<md5file name="fa.js">7058da97db5d6d700cbc61d2a21a4cce</md5file>
-<md5file name="ca.js">244aac18163a60e054d68c36fe3a0214</md5file>
-<md5file name="pt.js">dc0f022b5c07243035832fde05abbbb8</md5file>
-<md5file name="el.js">d5ee5e9062e1eb72d397896349364356</md5file>
-<md5file name="et.js">1b7f9d8725c4259ee427c528a7a44c18</md5file>
-<md5file name="nl.js">848d3d393e18b413f825fe47d6831133</md5file>
-<md5file name="gl.js">f7b3a70d845cf15ff446140d86fbc523</md5file>
-<md5file name="he.js">2937da2da3ebd1181e2028b65437380d</md5file>
-<md5file name="ro.js">090c60145b221eeef1603724ba5a36cd</md5file>
-<md5file name="sr.js">40047b3bf7923cf8b528c12d427e0d4e</md5file>
-<md5file name="gu.js">89d3c886d0e496b835e5cb8e4b70bb27</md5file>
-<md5file name="bn.js">dd709bda9084bcc30fb2364c93ca3e0f</md5file>
-<md5file name="eo.js">3abc2e5717f88868d39ea70b72863033</md5file>
-<md5file name="hi.js">47cfc1effb86cd33f04521d28821fd1a</md5file>
-<md5file name="no.js">8cd28f2d14a34235fa70221b362f7e5a</md5file>
-<md5file name="eu.js">fa90ee2416693e502ef3468fcc7b8e83</md5file>
-<md5file name="uk.js">4fbf79d4a94cf95251db1c3676913466</md5file>
-<md5file name="hr.js">b91e59bc080e0b4a4cf7edfd8a693feb</md5file>
-<md5file name="pt-br.js">8f54ac1037ac33b57f576db08f8d7ad3</md5file>
-<md5file name="de.js">d999447518e66f1b4b41878e57cbaa86</md5file>
-<md5file name="mn.js">034455bb71928598956d437efacb49a0</md5file>
-<md5file name="ko.js">3d6240fdff8cb8a51d9c113e6fb43534</md5file>
-<md5file name="is.js">ef9a0ff6de451900915f83b44ed9c733</md5file>
-<md5file name="it.js">edce8a83541e168debca66b2199dca29</md5file>
-<md5file name="th.js">c5847ebf22e80b5cc2d38fb14479be52</md5file>
-<md5file name="nb.js">13bbace6b20cd73781b01875fc533598</md5file>
-<md5file name="ja.js">c761da2c6cf06bcf61e144f235152ed8</md5file>
-<md5file name="pl.js">720433f1081eb4d6df77266a95302f60</md5file>
-<md5file name="ku.js">57ca3fc5af4f3f961d8e7f2c1eb790fa</md5file>
-<md5file name="cy.js">552f72702015e9ca7cce60938a31be63</md5file>
-<md5file name="hu.js">e17b94977639c424f3ecb6f52bd15d67</md5file>
-<md5file name="ka.js">d2d3e83d08249aaa44af84c2988e7d5d</md5file>
-<md5file name="da.js">acad8fcfa817ad704c6c744d0b2122ba</md5file>
-<md5file name="mk.js">cdc0746377a8b12d61be8812a6f7d044</md5file>
-<md5file name="sv.js">45ccff68595cddf51a4e7f39da5b107d</md5file>
-<md5file name="lt.js">3a0ef81c1dd16d86a921a9ad552aa5a2</md5file>
-<md5file name="ru.js">338197f81e8de089151747cf4d088a3b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wsc/dialogs" >
-<md5file name="ciframe.html">ce2c91ad6dfd86639dbd6fad1fbef509</md5file>
-<md5file name="wsc_ie.js">586d7b2d1045b9115a817507fe3b5b53</md5file>
-<md5file name="wsc.css">272ead8eec497be617cc3d390c427477</md5file>
-<md5file name="tmpFrameset.html">fd9e4859f8b774b936461669096cdf31</md5file>
-<md5file name="wsc.js">de26be26ca4ef240bd153a8c1dd0cfdb</md5file>
-<md5file name="tmp.html">2cab0bd74fdd7b997aba318b7c90eed5</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wsc" >
-<md5file name="plugin.js">e000d09cfb7fa17b91065bad4e642e1d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastetext/icons" >
-<md5file name="pastetext-rtl.png">7e244ea49524cac297c2db935bc4c3f6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastetext/icons/hidpi" >
-<md5file name="pastetext-rtl.png">005e92a64e62ee70165293969f7e8ad4</md5file>
-<md5file name="pastetext.png">10a79e01588ef824071560db0833603c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastetext/icons" >
-<md5file name="pastetext.png">bc35a09be3c5f9a7107b2b011cda6e7a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastetext/lang" >
-<md5file name="lv.js">7dccd26f16fd1ba6d82647d69fd7e829</md5file>
-<md5file name="cs.js">9fa62494bae4149b94cc915a54668d05</md5file>
-<md5file name="bg.js">04b5620bab2a6621242e6b85c28e70d6</md5file>
-<md5file name="zh-cn.js">125659976e92f59646b96a2fdd0d3b1a</md5file>
-<md5file name="km.js">c44f1f2c607e519fd0a6cc63b54fc5d1</md5file>
-<md5file name="sk.js">eaec7ae1c8140a8bdd1eeba5da986e67</md5file>
-<md5file name="vi.js">81ba5aa271152c52adc4d764982ee4b8</md5file>
-<md5file name="tr.js">c8f0ec91653ae8fc3a38518e37913ebd</md5file>
-<md5file name="sl.js">22f8a939a2db8688c01e1f7b89f02ec8</md5file>
-<md5file name="es.js">d8f3fe396763c0a89ba5fae99200520b</md5file>
-<md5file name="si.js">ca0a707dcc754a2fa7bf605227ff0295</md5file>
-<md5file name="ms.js">707af5608d5b3e9a09c6574224914794</md5file>
-<md5file name="fi.js">1afbc4cfd5e597e995e7278fe3812d61</md5file>
-<md5file name="en-gb.js">429ae70fad42b952f7220f7186025eff</md5file>
-<md5file name="en-ca.js">d1c600b4fa86d245f27f6818a17c6424</md5file>
-<md5file name="af.js">50153673c580b797448b17ec9798a1ee</md5file>
-<md5file name="ug.js">ccd381d3458fb877783dcb47c53ab08e</md5file>
-<md5file name="fo.js">e45f716f7591e5575fea3180860563f8</md5file>
-<md5file name="en-au.js">16849e53c607a199f35149e1478b5e03</md5file>
-<md5file name="fr-ca.js">c5768fe0f893de17c8f00d3bf9f4db5c</md5file>
-<md5file name="bs.js">d44b85bca880e33db65127aef31ddb39</md5file>
-<md5file name="ar.js">5257dc2bf2a5dd7a5458814123977586</md5file>
-<md5file name="en.js">0f4799a4d2b537dab1a4d44629794997</md5file>
-<md5file name="sr-latn.js">912024b336921503608fc4d50975f1d0</md5file>
-<md5file name="fr.js">4ca6b5dfed4c6ac285513a051edb338b</md5file>
-<md5file name="zh.js">04abfacd63b51bd4c4a8ec2dd1de0b67</md5file>
-<md5file name="fa.js">c8711285309c46d1bc5be14e05c6ca65</md5file>
-<md5file name="ca.js">685224eba8e14dbb8c1398b050f461af</md5file>
-<md5file name="pt.js">428d1e617fee4fe79b92966ffaa11f25</md5file>
-<md5file name="el.js">8f6f74a2ba3a2401b58854bb90acae89</md5file>
-<md5file name="et.js">62c2c4e3044de63b8aa11b2dfb44809a</md5file>
-<md5file name="nl.js">f7ff8a37607cd52def859f873c3aeefa</md5file>
-<md5file name="gl.js">15b63e1087678a477cb5b833fb150076</md5file>
-<md5file name="he.js">eaae9bbcd84423d52427e1dd96156b58</md5file>
-<md5file name="ro.js">e35a5053002efed30027b668d3116a97</md5file>
-<md5file name="sr.js">775ce9f1464a0211651bf0f8a5bfa18c</md5file>
-<md5file name="gu.js">b6dfc5cb64d2bab4af5f89b5812198a1</md5file>
-<md5file name="bn.js">56be4a409e9704646ea9f669dd494282</md5file>
-<md5file name="eo.js">11c4cc9af3ca2fcee8f4e4975c3e7833</md5file>
-<md5file name="hi.js">7b5b25a1ba0b52eff518e0349b5e35c2</md5file>
-<md5file name="no.js">c2a02db9de9a83f9cb7cd3cec201cd47</md5file>
-<md5file name="eu.js">5075e143b281199f63bfdd5449e133e7</md5file>
-<md5file name="uk.js">862ae0b77e8e317ccd6d0ef3e0732c6c</md5file>
-<md5file name="hr.js">d89c3500a22fa7e1c9240129f1d83ecb</md5file>
-<md5file name="pt-br.js">768bc69f53d627b4e7b21d7f75f09a6e</md5file>
-<md5file name="de.js">983c46a1d76f8a56d22ce5618d24789a</md5file>
-<md5file name="mn.js">a62af33f465e0aa663f820ca0188ebf6</md5file>
-<md5file name="sq.js">1dbe78ce97802d95f9193acf560c03be</md5file>
-<md5file name="ko.js">dcc55d206882c2af68ad8235ac97e58e</md5file>
-<md5file name="is.js">2c4d13185c75c8202f65022c08963603</md5file>
-<md5file name="it.js">b4637f410375f835ed3c90b1f72892de</md5file>
-<md5file name="th.js">206fb09e8f296ebd9f85be9cb9289f66</md5file>
-<md5file name="id.js">a879ee599be9760dc40840a4a462ba8d</md5file>
-<md5file name="nb.js">8557b50fe97da45ac8756f6a4d1bdf34</md5file>
-<md5file name="ja.js">d308aa05a2f05245f060c391dd6f93f6</md5file>
-<md5file name="pl.js">ac0a5489a29d733677ac7c89b2416864</md5file>
-<md5file name="ku.js">de5ccff459a14c59484a89205a1d959b</md5file>
-<md5file name="cy.js">0969a2f1c9794642dc22682e361779dd</md5file>
-<md5file name="hu.js">156cffe6d029da83a426aef7d3982fb5</md5file>
-<md5file name="ka.js">eeabb7881affe487a960606edd42116d</md5file>
-<md5file name="da.js">1b47bf9766d8cacf2c3c0b60ebe9b3fa</md5file>
-<md5file name="mk.js">633f9363b12fd8f5574143515b642778</md5file>
-<md5file name="sv.js">082f5b7b4ba85be86d80f0b0f3a50400</md5file>
-<md5file name="lt.js">3ab6eedbe157562250a547ab1d140a0f</md5file>
-<md5file name="ru.js">2f747bebb1bcef6255f8650a89376ace</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/pastetext" >
-<md5file name="plugin.js">88a94d80df79c5b40fddfc38c462b99a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/toolbar/samples" >
-<md5file name="toolbar.html">692e20db6b797b084592808e936f779c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/toolbar/lang" >
-<md5file name="lv.js">cd3335bc2d82cfe0d56caf236570106d</md5file>
-<md5file name="cs.js">aa5ed27aaf82b840ba087ef3d2787e04</md5file>
-<md5file name="bg.js">ca19b42f1adb825d58d57e3b2a739d20</md5file>
-<md5file name="zh-cn.js">c41a6f742d111e6b9e69c455515055ec</md5file>
-<md5file name="km.js">8428e9dd9d9677f41dcab782a7aea97b</md5file>
-<md5file name="sk.js">7d0ab24e3794439ba29d4aa48f4a0c7f</md5file>
-<md5file name="vi.js">bbd6bd0afcef117a4e47fcfc4a518b19</md5file>
-<md5file name="tr.js">8d6a079a12501c8fb4b1e5dd2473a6f6</md5file>
-<md5file name="sl.js">2d6e84919aa99d0451175fde78e3ebc6</md5file>
-<md5file name="es.js">3ada9bf47f0078d360c99e18277641fe</md5file>
-<md5file name="si.js">01c41bfdc40bd10ba190526eba306fdd</md5file>
-<md5file name="ms.js">becabad6a051cb361ecf4c01cf446f74</md5file>
-<md5file name="fi.js">2ac6d502533254a08759227452505efa</md5file>
-<md5file name="en-gb.js">1551d9c1112af9eb9fdada91e9d51cef</md5file>
-<md5file name="en-ca.js">0a633d7a75a70fd222bb0f00b97b43ab</md5file>
-<md5file name="af.js">0092c63651533044068aed3c5a72e66d</md5file>
-<md5file name="ug.js">cccc9e28e824471fc6fa19b7d6b0e505</md5file>
-<md5file name="fo.js">cc85dd4f864541a37030e31d4f999bd2</md5file>
-<md5file name="en-au.js">4bab956687ddef71e1bb8d10a5791eb6</md5file>
-<md5file name="fr-ca.js">f06b456a67bf306fd870eab672b8598d</md5file>
-<md5file name="bs.js">78b01d50c6acb898bd5c9467ef7eb697</md5file>
-<md5file name="ar.js">a34f278151995523a345ddc569c1ad9b</md5file>
-<md5file name="en.js">18dc3202e452555bb9e99d0973262752</md5file>
-<md5file name="sr-latn.js">42b7be9cd7b2dcd67b0631441b6fa2a2</md5file>
-<md5file name="fr.js">618e08d1a1ee76a570c3794be96899e3</md5file>
-<md5file name="zh.js">0d134260d954269a57ad1c7cbef97e32</md5file>
-<md5file name="fa.js">cbc332cad54788eb88a5985a82fedf4a</md5file>
-<md5file name="ca.js">72dce0732aaf164cc938bec5aab86836</md5file>
-<md5file name="pt.js">beb1aaab495a85df74d549a4fd16ab75</md5file>
-<md5file name="el.js">e3207e4ccacbba12adf525e837133cc2</md5file>
-<md5file name="et.js">f3816e17dfe77dfdea4dfea4db6281e5</md5file>
-<md5file name="nl.js">7e55b90d516a508d90386e4f1fa901f3</md5file>
-<md5file name="gl.js">341cafa16a4453f5ea90da70e640d574</md5file>
-<md5file name="he.js">e1bf696f6e95ec90ceb0d4b5e306918c</md5file>
-<md5file name="ro.js">5f9020e599b44474d5b8a59948282b72</md5file>
-<md5file name="sr.js">9f0dadce14495794753589351fb2f9fd</md5file>
-<md5file name="gu.js">a9ca3f6a4820c4f075a6fa7810be0921</md5file>
-<md5file name="bn.js">63f7e3a84429869b296a272bebf80009</md5file>
-<md5file name="eo.js">fa5b39843bddb4610105cf399b460f24</md5file>
-<md5file name="hi.js">0944b6df9271cdf1450fcf3d1d364cdf</md5file>
-<md5file name="no.js">5cf61f2e90951fc0db70efb0c211786c</md5file>
-<md5file name="eu.js">d4f1661b9ff3610b5d7f8b1a74472d4f</md5file>
-<md5file name="uk.js">26042c05a9894e7e195e3fad7e254bc5</md5file>
-<md5file name="hr.js">f749d8a1cc8ff8024f9add4fffb98711</md5file>
-<md5file name="pt-br.js">490957bf6c84850b9a1e0a7ab2c3f896</md5file>
-<md5file name="de.js">bc18664a64f5e95aa041a4c247c42ffa</md5file>
-<md5file name="mn.js">80502d46ca2b54e3f82d6603b0115741</md5file>
-<md5file name="sq.js">c1c0d2935cbdb51bb9576399f1015c11</md5file>
-<md5file name="ko.js">1251916aa7235cc839f82e9d63c61531</md5file>
-<md5file name="is.js">b276786905ecaabe7050400041331561</md5file>
-<md5file name="it.js">d7da526de089ba90d116347fe52af9ae</md5file>
-<md5file name="th.js">1d2e2c6a2ff30107693920d227545b4f</md5file>
-<md5file name="id.js">1efadc4f92fd784e951d45177aeba8d5</md5file>
-<md5file name="nb.js">fba065c3f0f6050f9bffed86803450fb</md5file>
-<md5file name="ja.js">de9cec2ee73d79fba3f170dd9a6fd633</md5file>
-<md5file name="pl.js">4d53d37ec785c8810afd47da28df62c0</md5file>
-<md5file name="ku.js">3d6b3f6d6a4b2ec03f17b6dc13bfbebe</md5file>
-<md5file name="cy.js">42c7ad2381d10bb65963c236a41dae63</md5file>
-<md5file name="hu.js">eca0dba3c96aa8e96836860c7597833e</md5file>
-<md5file name="ka.js">fd16cd57de3e72799f36a6fee796cc0a</md5file>
-<md5file name="da.js">9cc94696018e1e451a6165b5fadc4ee5</md5file>
-<md5file name="mk.js">c8590e1c0551c7efab6946a920559994</md5file>
-<md5file name="sv.js">1af5632c10940ed04e4f3feee4124e00</md5file>
-<md5file name="lt.js">a98a8f4704ac217a1e86dba30af14a35</md5file>
-<md5file name="ru.js">b2c01d47cb53b49dd8a398e93b9cd5d6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/toolbar" >
-<md5file name="plugin.js">04aaf1aaa0767de7c4312205606378d2</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/panel" >
-<md5file name="plugin.js">72456b00bf57c2bdca437c5c48135647</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/liststyle/lang" >
-<md5file name="lv.js">9a7af859f5b12c15b5b6285308e982b6</md5file>
-<md5file name="cs.js">e8b960692d1d119505b4761d397a41c8</md5file>
-<md5file name="bg.js">9816e29b3872a45e9d81a9c114170ecb</md5file>
-<md5file name="zh-cn.js">f6fee0b8e1c4ff3e19382aedb7ab9f52</md5file>
-<md5file name="km.js">376de3ef0ac8ac61b2f32bc7acd8eeaa</md5file>
-<md5file name="sk.js">71f5a10bc7f4f677fb999db2a9180471</md5file>
-<md5file name="vi.js">a84c2a499a214a13a21ca1e954b05a31</md5file>
-<md5file name="tr.js">99b23ce0612bc8bfbbdf6bc49740c968</md5file>
-<md5file name="sl.js">0512bb5b52801afae8c6c599112d5cd4</md5file>
-<md5file name="es.js">9f892e93945e7b3e40c5afdb9984de8e</md5file>
-<md5file name="si.js">bf2fe4211777fa79cd85a091324178f1</md5file>
-<md5file name="ms.js">9805853ce7c759877250763042b684c1</md5file>
-<md5file name="fi.js">31ccfaa6f3df0053086adf5c72d5e427</md5file>
-<md5file name="en-gb.js">4ff9e703522f3ac084f35a9f84d77d7c</md5file>
-<md5file name="en-ca.js">927759d3adf4c5d3238410f0fd4ffb5a</md5file>
-<md5file name="af.js">8c7f7eccf285b39347cbfb96eaa51bc2</md5file>
-<md5file name="ug.js">c0400c70dc30b5b5aff5ab169a898a5a</md5file>
-<md5file name="fo.js">900f3a2f4411d10e7688a3679be3c965</md5file>
-<md5file name="en-au.js">3d2ba455e78d218a5ab31e78a2ac4c36</md5file>
-<md5file name="fr-ca.js">a028302ca9f81637b36d0cc948b54174</md5file>
-<md5file name="bs.js">3a203e28a9c285d02dc300ccc4029642</md5file>
-<md5file name="ar.js">0651d57b68b5230375b02be6d044d2dc</md5file>
-<md5file name="en.js">88080902673d4ecd4222070c110ebb54</md5file>
-<md5file name="sr-latn.js">6d6ccec65e35b5f76684ee52526d74f2</md5file>
-<md5file name="fr.js">5ccf0ded2de23c2b69fd6948c1108d03</md5file>
-<md5file name="zh.js">33866d7a97b295879ca893dd3c09cd20</md5file>
-<md5file name="fa.js">357b614ab10f3bce1cd530eb5b1abc90</md5file>
-<md5file name="ca.js">eb768ad4efc097c7712ab2bae34e13b3</md5file>
-<md5file name="pt.js">dad6459bf4086efb7f7901cb6ee560af</md5file>
-<md5file name="el.js">772f8b59a36d04471136584a9f3d82c5</md5file>
-<md5file name="et.js">929237c7af0850f0dd42950d45168163</md5file>
-<md5file name="nl.js">ab27509d1efc3064a91078f29aa72d4e</md5file>
-<md5file name="gl.js">67707e8118d72b2f687596ff273bfcbb</md5file>
-<md5file name="he.js">7c22a31c9f2a318702128e6a2fc8a13d</md5file>
-<md5file name="ro.js">61ac990e48b25f7cba5af4e9f037f62d</md5file>
-<md5file name="sr.js">d3e1712e33762922e691efe371cbd285</md5file>
-<md5file name="gu.js">d584e0104f73cf19f42be51264124888</md5file>
-<md5file name="bn.js">f0895565cd76e7b4e51fc923944dbb37</md5file>
-<md5file name="eo.js">79565e95e823a6a94344f3f70dea2ae0</md5file>
-<md5file name="hi.js">4eb959d933a8f6a0f6030fbccbb54f69</md5file>
-<md5file name="no.js">e913e87abbf59840d31a5f5303f1e205</md5file>
-<md5file name="eu.js">47f34331d7016dbc6c18f53093bbace6</md5file>
-<md5file name="uk.js">b4a1885a02afbdfd20cf3dbefa0c38c2</md5file>
-<md5file name="hr.js">33dbd41012f2d8d5503ad09923c5c8e2</md5file>
-<md5file name="pt-br.js">0428e41f9d091d86b76cdafe35e98b3d</md5file>
-<md5file name="de.js">6ca8b568fabba17efc290e6bd99b889c</md5file>
-<md5file name="mn.js">721eac7a9ff861f192a1080b8fd2d222</md5file>
-<md5file name="sq.js">8afff99c215828f3778e96843f56c1d6</md5file>
-<md5file name="ko.js">7df81b0a58f0828898d2bf496a723bf5</md5file>
-<md5file name="is.js">b7abb662fe04024ff7b7274e8ee2f01e</md5file>
-<md5file name="it.js">34da72116f6b107226ae5bf956d36deb</md5file>
-<md5file name="th.js">107293c4f95e043bbd27c59e02a2e036</md5file>
-<md5file name="id.js">ba9fb3df6c19f55d827aa89c9d48e395</md5file>
-<md5file name="nb.js">848fe203e64b9d62d18debe2eda1f440</md5file>
-<md5file name="ja.js">86614f73c28fba5e34f0fed0c1342525</md5file>
-<md5file name="pl.js">a554adffa6aa31e9eac4f23fc5a3cd1c</md5file>
-<md5file name="ku.js">5cc1c3f1ced768e66a7cc31cc7185d5c</md5file>
-<md5file name="cy.js">90670a763e5207226393cba5dee0ab8c</md5file>
-<md5file name="hu.js">a374dc97cfad5336182d563c842a206e</md5file>
-<md5file name="ka.js">f0f5c1e617ec1bb569eabb01743d1ce0</md5file>
-<md5file name="da.js">5eff55f41b488f6601002a5f65b7f6fe</md5file>
-<md5file name="mk.js">cdf4af5545ebb5e23145f1e668ba6aa6</md5file>
-<md5file name="sv.js">ea073db87a9fdab0cfe160fa6014171e</md5file>
-<md5file name="lt.js">ea803a95f0e9f1ecc71300443c50ebd4</md5file>
-<md5file name="ru.js">6c1fb8268ea1138e983be73428e83fba</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/liststyle/dialogs" >
-<md5file name="liststyle.js">5e9ebfc29b4989010e7cf0497e1ea3ff</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/liststyle" >
-<md5file name="plugin.js">245089c23067de21b6cd2036e94b0230</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/htmlwriter/samples" >
-<md5file name="outputhtml.html">74a27a4eb92496daff4c8b3e8102206e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/htmlwriter/samples/assets/outputforflash" >
-<md5file name="swfobject.js">aeaf00778709d1b32e3202a373db3d81</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/htmlwriter/samples" >
-<md5file name="outputforflash.html">d7c15118b921e6d79f7377bb74e8aa1a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/htmlwriter" >
-<md5file name="plugin.js">5c4ba8c3c0f8c8d579a8144c6dc47049</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wysiwygarea/samples" >
-<md5file name="fullpage.html">37ca40ad2de204bdc31b776570b78f46</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/wysiwygarea" >
-<md5file name="plugin.js">8c1e9253480167775b996483294ee36f</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/icons" >
-<md5file name="templates-rtl.png">c36af72113ccee4cf0e556b877ff094c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/icons/hidpi" >
-<md5file name="templates-rtl.png">17227e3510942eb943576846725ee696</md5file>
-<md5file name="templates.png">17227e3510942eb943576846725ee696</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/icons" >
-<md5file name="templates.png">c36af72113ccee4cf0e556b877ff094c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/lang" >
-<md5file name="lv.js">e9de9abb34883463846f9fef369a4a16</md5file>
-<md5file name="cs.js">acca9833590682114a331f23440fa109</md5file>
-<md5file name="bg.js">9ec5b89a76d8ba24ebf630d86105eb4b</md5file>
-<md5file name="zh-cn.js">1db70555e0a91b838ae01c873af08e62</md5file>
-<md5file name="km.js">a27ac5eab7a5363a64e25fd9c7452428</md5file>
-<md5file name="sk.js">8deaa2d6e01a795ed85f97a7ee2a92f3</md5file>
-<md5file name="vi.js">7c7fddd05cf2c6f79377528e60e71e88</md5file>
-<md5file name="tr.js">119186c7bd4dc1d57d737a95cf0ab68f</md5file>
-<md5file name="sl.js">1063e323499af708967c6e8599168eb9</md5file>
-<md5file name="es.js">dda755be89653ed90c50a96f85032be2</md5file>
-<md5file name="si.js">89d2c7af93c123a273884f9acd3ce56c</md5file>
-<md5file name="ms.js">d999b9bc31ae3ed13a20bfaa7dded4c2</md5file>
-<md5file name="fi.js">7eea7c0ac1dc1293b5625966250f45ac</md5file>
-<md5file name="en-gb.js">7e4ff09840594f15dbf6cc4a78e125cf</md5file>
-<md5file name="en-ca.js">39dba480512d1eb5dbf81d3b2b469b4f</md5file>
-<md5file name="af.js">e5894f67831ec88753e18729cd50bba2</md5file>
-<md5file name="ug.js">f52f55f52546ac4edca9dec441664ab9</md5file>
-<md5file name="fo.js">e2b4dcf5b82c5078e531befebc007829</md5file>
-<md5file name="en-au.js">1660db71f909709909c1369c275d4122</md5file>
-<md5file name="fr-ca.js">76d0c647acb18b22e1c403fd5ce54763</md5file>
-<md5file name="bs.js">b869ab82ebe8edcb3a06ba62c47192a7</md5file>
-<md5file name="ar.js">a23374b65407a21aa6ab11dbf998995d</md5file>
-<md5file name="en.js">cba9920f5283ee00d9bcfe51935a7965</md5file>
-<md5file name="sr-latn.js">0e7efa59ec71df19d77fbbcc8730d140</md5file>
-<md5file name="fr.js">376d75361ce846342d6cf627a001ca1e</md5file>
-<md5file name="zh.js">76271e662b1e8e14b9d44ceec672fa94</md5file>
-<md5file name="fa.js">d06e9771dfc296e3ce61db3dc37a5349</md5file>
-<md5file name="ca.js">06ede1ceb3e8e098b85b4a2facd22e21</md5file>
-<md5file name="pt.js">7e382f51c426171c77ac65bdc203d389</md5file>
-<md5file name="el.js">47058a994ac46273f00519eac6c8eaa1</md5file>
-<md5file name="et.js">2f185cf5b017ac42a21054984a865be1</md5file>
-<md5file name="nl.js">6185de6d056be3cd3696e154da9c1be3</md5file>
-<md5file name="gl.js">1e3833519a57a93e419555ee9d90dbab</md5file>
-<md5file name="he.js">d2cda74f94de0f7be61c60b75eb41444</md5file>
-<md5file name="ro.js">7b441758b0369fd899ea318cc1bd988d</md5file>
-<md5file name="sr.js">976f9ac65de0e961fe7d3cb8148dfa50</md5file>
-<md5file name="gu.js">dddab59c5a3c9c7008d3f007ebbcaad9</md5file>
-<md5file name="bn.js">5a962bdfb2c89b879a0a1767f4dd84b1</md5file>
-<md5file name="eo.js">e1810de740697162646e856fbd5027bd</md5file>
-<md5file name="hi.js">b69e3f108096936bc60059f9b7ee8e49</md5file>
-<md5file name="no.js">d47043a994d1c39399ee2f3789ecf25a</md5file>
-<md5file name="eu.js">8ed5d68fc4e6f4c83956f73324a6d028</md5file>
-<md5file name="uk.js">b9754cc58d9a783d88f8495a4c98c6a4</md5file>
-<md5file name="hr.js">7b3898461e5063fcc5e3d719beaf706a</md5file>
-<md5file name="pt-br.js">3081d95229b18a9beb92e6d0749f6952</md5file>
-<md5file name="de.js">9b076e5dd55b43b6d1fdd40c99e9afa2</md5file>
-<md5file name="mn.js">10ff4bc7f1613f5d64d49db46dc8be42</md5file>
-<md5file name="sq.js">96b4587f1d0cb0415368702dd72d465e</md5file>
-<md5file name="ko.js">0186a896aba9cba934300b139c5489f9</md5file>
-<md5file name="is.js">9e41871e4bbfa3d46af20ea193f94dbf</md5file>
-<md5file name="it.js">0842b61a016ab9e5f16c45d17fc3c032</md5file>
-<md5file name="th.js">97cdb58b5fd277b5bd4097b13016e804</md5file>
-<md5file name="id.js">e5a6d20e62527b9d49563d28f9f62aa9</md5file>
-<md5file name="nb.js">4b3a8bbf6fe9b433d650832a6637acff</md5file>
-<md5file name="ja.js">3a3ab16b3f5b7a1b73fad7a45c8c3cfb</md5file>
-<md5file name="pl.js">b20a3f56b257d412ca4d78903ebb27f3</md5file>
-<md5file name="ku.js">6895797a3759985d0a0dc455bacfd61b</md5file>
-<md5file name="cy.js">6f84f419dbb57eff8cbd55673b9fa05c</md5file>
-<md5file name="hu.js">7f5a528531ceef6ce94f417206b8b90a</md5file>
-<md5file name="ka.js">740f0a20ca582a63bb9b69fd67fbf445</md5file>
-<md5file name="da.js">84d3cc32b75f5d45858272630d10cab0</md5file>
-<md5file name="mk.js">6432a684fa20021b8b26f94ab85b08c1</md5file>
-<md5file name="sv.js">9d047f4c4fa64ef60a8077076cbda6d3</md5file>
-<md5file name="lt.js">6fa466ae1b787448983b8c3cda946e4d</md5file>
-<md5file name="ru.js">049d8ecb76f8945c16851577bb105647</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/dialogs" >
-<md5file name="templates.js">a013597cdab1f0d46a67fec6acf3cb81</md5file>
-<md5file name="templates.css">502ec066ce17658bc228175aa6d2bb51</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates" >
-<md5file name="plugin.js">2970309425dbd62a04b427a38c74be95</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/templates/images" >
-<md5file name="template2.gif">8a4d45166ebeef73e222270a8113d66f</md5file>
-<md5file name="template1.gif">fc667c4366fe133c30ab122fe2ee7f20</md5file>
-<md5file name="template3.gif">b8650f06582ac88ece68948bac1bf734</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/templates/templates" >
-<md5file name="default.js">10478ac144e87538c4e4d794d2f440c8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/contextmenu/lang" >
-<md5file name="lv.js">89b85d46dd17f5f9834192644138cc3e</md5file>
-<md5file name="cs.js">9bc93c463af11160b7419bb9b9b8c04d</md5file>
-<md5file name="bg.js">516927da047cdbeb264d2ceff1bc7302</md5file>
-<md5file name="zh-cn.js">4ef63ab18e11e0a1776618dce42b0c68</md5file>
-<md5file name="km.js">4d00f1ca9878eadcfd9464e911156b9d</md5file>
-<md5file name="sk.js">b7dd4753a1f73eeccd3e0d0c62aa6c46</md5file>
-<md5file name="vi.js">a592c3240592cd0bf5459d0cb91f060d</md5file>
-<md5file name="tr.js">172e05b5b4f37bc52fc55ec3ddf16c66</md5file>
-<md5file name="sl.js">72761ecefe18d122afe20aaaa16f29af</md5file>
-<md5file name="es.js">050a1b0a9290bcec41595cbe7626c6db</md5file>
-<md5file name="si.js">76726937ea2d3889c61d6ccc5a09799c</md5file>
-<md5file name="ms.js">00e11fea38ef53d0e99868e5e5ca3346</md5file>
-<md5file name="fi.js">ae213dd5d98995ed7abee5aa12c9b37c</md5file>
-<md5file name="en-gb.js">093451992f3c1ff768b1fbc0a3490a42</md5file>
-<md5file name="en-ca.js">0d321674b7d1e0aaced16cdbe69e4cf9</md5file>
-<md5file name="af.js">411dba233b13bdb756c2b98314f5800c</md5file>
-<md5file name="ug.js">e3404b9c51f7af0b604373712eb44561</md5file>
-<md5file name="fo.js">48c7402486c5a80774f5addb0f109ace</md5file>
-<md5file name="en-au.js">8d62607818f94d8a1637bbac1901602a</md5file>
-<md5file name="fr-ca.js">6806b9d5ce203fc4e6d38663a71ef27b</md5file>
-<md5file name="bs.js">ae3609a24c28179373af4c58c6ffdf97</md5file>
-<md5file name="ar.js">154fc13ae002da4831a93d73a8dc7571</md5file>
-<md5file name="en.js">6b7f082eb0413e1beb242ba6068530f1</md5file>
-<md5file name="sr-latn.js">d1e5db489cca322903a695682ec464d7</md5file>
-<md5file name="fr.js">9885b4beb2e0e3e2ac4341a6d0cae010</md5file>
-<md5file name="zh.js">2bd5e9d1c8fb89c95faa6a97971420fd</md5file>
-<md5file name="fa.js">682c930d5a0ef0d12aa0fda61875bc0f</md5file>
-<md5file name="ca.js">99f536af5bdcf5d1c0ba759992e509d9</md5file>
-<md5file name="pt.js">2fa9f916bb83bba6b5ebd68be51d8df9</md5file>
-<md5file name="el.js">7f5f888e6640de48b7b0efe59ee94976</md5file>
-<md5file name="et.js">0442580293b0ae840b7bb56095d0eae7</md5file>
-<md5file name="nl.js">9826e5b2520054f478e031f1d8b06749</md5file>
-<md5file name="gl.js">812b7f68232db25ecadbe4283929a1c5</md5file>
-<md5file name="he.js">c271dc0a582c32a4937c2e045380e931</md5file>
-<md5file name="ro.js">2bbc98751301bddc8b98e00dbb497ae3</md5file>
-<md5file name="sr.js">2bc69e3f4bc2a07381e17120087609a4</md5file>
-<md5file name="gu.js">94916b5d7126d3375c8eb0f7925072b1</md5file>
-<md5file name="bn.js">502f9ec9080b807dd076f238ac6066b0</md5file>
-<md5file name="eo.js">345c759bba2bada6514baae01c2267a3</md5file>
-<md5file name="hi.js">31c8d8ee369b1951c2ef80b67e6c0ec9</md5file>
-<md5file name="no.js">9c40f2e3f06a503013a8f7b94ecf4c90</md5file>
-<md5file name="eu.js">2ca72172e0dee2aec9d5841bb3a2c6b2</md5file>
-<md5file name="uk.js">4686f3a2a0357dd5da87c3d4bc6df5ff</md5file>
-<md5file name="hr.js">975fd7e0efc7724969154310df64e698</md5file>
-<md5file name="pt-br.js">8e80a351912e1d9c3e41335ae2b08768</md5file>
-<md5file name="de.js">f379f3b87adc4f12cd701bb7acf0535e</md5file>
-<md5file name="mn.js">856af24ec7a610a60d23888ab1d2f27c</md5file>
-<md5file name="sq.js">5fe30721dfec5ace0d84b86415ea12c5</md5file>
-<md5file name="ko.js">7b29734a895fb4fffc1fd13f93980adb</md5file>
-<md5file name="is.js">e66626a3ce21b7cd66732baa13433b78</md5file>
-<md5file name="it.js">f541e0145c3cc3779ad73392dedacf9b</md5file>
-<md5file name="th.js">23098ec985ada5f5128ccc3527e461a4</md5file>
-<md5file name="id.js">9ce75f5d9bf3295f1f9823be227a8621</md5file>
-<md5file name="nb.js">e3eaad6ac1cd47ab7bca00b1aa996d2b</md5file>
-<md5file name="ja.js">0bcefe1dc3173741c0608ba7ceda0ff0</md5file>
-<md5file name="pl.js">f6d252c6803dbb9b04b5b65b6f8d39fb</md5file>
-<md5file name="ku.js">5451e69fa34c32bc892d66e8896aa782</md5file>
-<md5file name="cy.js">4c0d7c37cc0afd8585c62276f736ea6c</md5file>
-<md5file name="hu.js">304125a8db08f6dbf8b04a8e48c6ec87</md5file>
-<md5file name="ka.js">96133c2f110639a2ca58ced7482141dc</md5file>
-<md5file name="da.js">23658b4c4f2ccd097c75082fd75487ae</md5file>
-<md5file name="mk.js">9185b0f6fc929157e4e84a82c413d699</md5file>
-<md5file name="sv.js">10734b49e0f9d2803b256b883b9bf3fb</md5file>
-<md5file name="lt.js">2122e1438e074327f6b573a239950fa0</md5file>
-<md5file name="ru.js">7969843889aa44cb8e63629c88e864e6</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/contextmenu" >
-<md5file name="plugin.js">0e5f05b82a9b77b0cb302e65ddd05635</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash/icons" >
-<md5file name="flash.png">5b53952452eab634c20b3f6949f58807</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash/icons/hidpi" >
-<md5file name="flash.png">3cb8e7e34baaa92f9a177daf6bf66a5e</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash/lang" >
-<md5file name="lv.js">dab0bea2a45fcd730255f075a399cc0d</md5file>
-<md5file name="cs.js">66eaffabe362d2cd1b092df702926a7b</md5file>
-<md5file name="bg.js">63f5a644044dff35542aeb5824076942</md5file>
-<md5file name="zh-cn.js">83b84e0d69d2a0bd430e4a2f3d0184cb</md5file>
-<md5file name="km.js">b220973d49b1188b4e95e1c658b06c3c</md5file>
-<md5file name="sk.js">aa0c45c5a3e82980e67a3a26485c4068</md5file>
-<md5file name="vi.js">94615c2fcbad6519c2e0a3b8711e9aa8</md5file>
-<md5file name="tr.js">2e8350503151a18bc7e9c1b2204788d2</md5file>
-<md5file name="sl.js">672975b025e7cc96c5404ad861527d07</md5file>
-<md5file name="es.js">5c5da4e28ed613e85a49edf4856a6822</md5file>
-<md5file name="si.js">1a84925e4a30a0e0d343294cbbdbb529</md5file>
-<md5file name="ms.js">62733a2d6f590753ca7bc473984f7324</md5file>
-<md5file name="fi.js">e8fc75c03c47a4cb2afe36070b18f4a5</md5file>
-<md5file name="en-gb.js">c76493db176c6d5a8fd8c85ff636dccf</md5file>
-<md5file name="en-ca.js">84ba6b7c343b1c651dae1586edb01e01</md5file>
-<md5file name="af.js">2511c537c17dfc75369b8974967de984</md5file>
-<md5file name="ug.js">dd3828accc2e234856d11257b7dd7281</md5file>
-<md5file name="fo.js">cba6dd7f7647ea925b8a43b6c7378473</md5file>
-<md5file name="en-au.js">601c51a57ac3fa90e6350829889756f1</md5file>
-<md5file name="fr-ca.js">b1f200747f349b3ba3d4e74b3f5c6994</md5file>
-<md5file name="bs.js">b5c6bea87a3781a1cf651f6a364e2a2c</md5file>
-<md5file name="ar.js">bd34497387c8504d2357fe09cb29a946</md5file>
-<md5file name="en.js">6b031f2eafae110e2b40cbea47d6d959</md5file>
-<md5file name="sr-latn.js">c400a03be480a9d031f65ac88f9288be</md5file>
-<md5file name="fr.js">bf08ded8d78533545fc70f3905c65c2c</md5file>
-<md5file name="zh.js">dc0233fdb0864c95e562db5baea836ae</md5file>
-<md5file name="fa.js">779b563b2757b037e34488deaf4f291a</md5file>
-<md5file name="ca.js">5b666ee35e4551ab235f34af949e10b2</md5file>
-<md5file name="pt.js">b288944edde6e32f83e09b1ac75b4233</md5file>
-<md5file name="el.js">b1f1853c33c2f2ae36d3652ca4804a77</md5file>
-<md5file name="et.js">2aba72d5a58f530493c35c917aa628f6</md5file>
-<md5file name="nl.js">e432acfb55c6ea09e30d42570424f007</md5file>
-<md5file name="gl.js">2260715525b098c08df436b117416e16</md5file>
-<md5file name="he.js">27607be4c20fb2cf8f76f50f366a0ef6</md5file>
-<md5file name="ro.js">407ea0dbdbadc30a149f1fb68bbaa2d4</md5file>
-<md5file name="sr.js">e33fe89d85affffd2c6467c1a0c15676</md5file>
-<md5file name="gu.js">3e35e088bb450acf85163b28f1941eb2</md5file>
-<md5file name="bn.js">59eb0b09fe26d75439737eff0e339fda</md5file>
-<md5file name="eo.js">0f98b55f7b8da09bf0f5974f9090a251</md5file>
-<md5file name="hi.js">2d9a64283afb545d8561ee5f4602be1a</md5file>
-<md5file name="no.js">89be065ce3f4c188dd10be066e0b91d3</md5file>
-<md5file name="eu.js">e996d10356971c7589054a5a3e23dad9</md5file>
-<md5file name="uk.js">6a474b90221ac3417d6606beac1c474b</md5file>
-<md5file name="hr.js">f56f9e3a8fb4ec0df9a5373867950f32</md5file>
-<md5file name="pt-br.js">2116a5011c951b5910e64a2d3c6f929f</md5file>
-<md5file name="de.js">2691c88717b7a5520c96657130fa679e</md5file>
-<md5file name="mn.js">87892c5ab3f53702a72389e4226ccc5a</md5file>
-<md5file name="sq.js">0a88a57f28dcff30a5a90171b5fc9716</md5file>
-<md5file name="ko.js">7232c727b317be81b53ddc1faf00f320</md5file>
-<md5file name="is.js">3f3d4121e2d5ee452aab3264439e5364</md5file>
-<md5file name="it.js">c6df2b096e79cddece1eb44a5419f6f5</md5file>
-<md5file name="th.js">b0e7787bf67f5d4ae4f61d658f652fc5</md5file>
-<md5file name="id.js">4968fb0bc998718b58579bb0ff8ef8f9</md5file>
-<md5file name="nb.js">c409580eaccea712dc1135a51f192300</md5file>
-<md5file name="ja.js">30f78a15662e4907438a3f3da2032095</md5file>
-<md5file name="pl.js">d823eab3b1cbfcd5d6501497e7b4d9a7</md5file>
-<md5file name="ku.js">f67e47685d37b480ad0ae17b3c60e278</md5file>
-<md5file name="cy.js">71c4b90a4d0f31cc209fe31be16d31d5</md5file>
-<md5file name="hu.js">dd57091610a5cb9f3d433c0974f9ea21</md5file>
-<md5file name="ka.js">6bb702b49f457d4760febb5f68b660f4</md5file>
-<md5file name="da.js">066d078712736fe0ca54cc6989158897</md5file>
-<md5file name="mk.js">564554bdd727dc2cc9ea1a1a27f9f45c</md5file>
-<md5file name="sv.js">6beced9c2e60af599cc713454271843c</md5file>
-<md5file name="lt.js">7a658dd4bc6d3c1bb78ce15b180b5243</md5file>
-<md5file name="ru.js">50671e176a12bfeefedc8b346482ae41</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash/dialogs" >
-<md5file name="flash.js">7c24562a2e36b60a1b49e24cb395a902</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash/images" >
-<md5file name="placeholder.png">e9ac9384237d8d1cdaab68d31a22005d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/flash" >
-<md5file name="plugin.js">86c02859bf76535e227b147df1d7f9f8</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/preview/icons" >
-<md5file name="preview.png">8cc8278179fbb415e3f30b98c5e8b4fc</md5file>
-<md5file name="preview-rtl.png">9b0c9e19562eb950621e2d8182595659</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/preview/icons/hidpi" >
-<md5file name="preview.png">5e99092b13d0e0a7672fdebb2e988b8c</md5file>
-<md5file name="preview-rtl.png">2cb9e8108f97f63366b4146f9472e4ce</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/preview/lang" >
-<md5file name="lv.js">9e1c9fe94ff8f7b1726af502b6fd9101</md5file>
-<md5file name="cs.js">69c4ecd12d81dede6dfa123d268ad20f</md5file>
-<md5file name="bg.js">9dba534e4cce2ebc3001361ca89c16a4</md5file>
-<md5file name="zh-cn.js">0fadf9a8ea97fa78362c7b41c532a8d3</md5file>
-<md5file name="km.js">4ce6e22e12c97b220b44c6b9fc5f2479</md5file>
-<md5file name="sk.js">7058815c72bcd527f38f2fd7897fa692</md5file>
-<md5file name="vi.js">9ce9358b2005623969aa614b56074c44</md5file>
-<md5file name="tr.js">6e316360fc9d8bbfbed43f8310e79182</md5file>
-<md5file name="sl.js">7ff09313a5f0f914b270251b49929453</md5file>
-<md5file name="es.js">18f09b157524d2a313cbacf9eea0bab1</md5file>
-<md5file name="si.js">2f56924e399e7a21c261f284916f7e60</md5file>
-<md5file name="ms.js">f0f2ca3d96fca432767eafc3dfa7305b</md5file>
-<md5file name="fi.js">e54a2776b7537a0f67d35a8238ff72f0</md5file>
-<md5file name="en-gb.js">a296a27e6f06c12ec27352de5b0aa45f</md5file>
-<md5file name="en-ca.js">798dc4862de11017fb774e09b19851f0</md5file>
-<md5file name="af.js">ddec456d3cd40f7bd16c05d4808f2bf3</md5file>
-<md5file name="ug.js">4d3aa4d4c43ad2858566dad3ff94325b</md5file>
-<md5file name="fo.js">0a18f254e78285e5a26a5e0027ccc036</md5file>
-<md5file name="en-au.js">3a3d76dd23ab98ff9bfc97b9e37cd75c</md5file>
-<md5file name="fr-ca.js">d05e5903b19290570242a5e957ea3aa8</md5file>
-<md5file name="bs.js">77b6d75a4303d301cd4707b4380d6fcf</md5file>
-<md5file name="ar.js">e41d5bc5675d8b2641cecd6011694668</md5file>
-<md5file name="en.js">da236e3156d063227e8176559a7a5fbc</md5file>
-<md5file name="sr-latn.js">8aba98a5ff4570ce929b7f629264f33a</md5file>
-<md5file name="fr.js">d41dc695ebbdc36169f5a57f0141f8c1</md5file>
-<md5file name="zh.js">0cb694690f5f16646014d0482e7683d1</md5file>
-<md5file name="fa.js">567c6d4d2a0345e3691e1317d45168fd</md5file>
-<md5file name="ca.js">d00cf099ef638a1ae4b6cfc8f2020d7a</md5file>
-<md5file name="pt.js">7b31864fef1065e47cb2799ebf49b744</md5file>
-<md5file name="el.js">35b23f1000c82bc953dc9b5f15f1b061</md5file>
-<md5file name="et.js">cfab365bc228ba94a18de47da3a45473</md5file>
-<md5file name="nl.js">8e1e8de34dbfcccaffabbc078d8bcd68</md5file>
-<md5file name="gl.js">2c1319dde3b7ad238ab6cb020a81f407</md5file>
-<md5file name="he.js">a8b883b1d5ca4760a8002270f1c6fbfa</md5file>
-<md5file name="ro.js">e1a908e793dd21b3bb30f092f3ffee23</md5file>
-<md5file name="sr.js">9072c79603ee2da1510f1b722e400a32</md5file>
-<md5file name="gu.js">d504430032da050b01b1e85c94a0874b</md5file>
-<md5file name="bn.js">ea5a49b0f49319d2366ab37c5ff96bfc</md5file>
-<md5file name="eo.js">30637ebf317fbb9afc94c93a7157794a</md5file>
-<md5file name="hi.js">2f647ac1976e2866cce1312e74ab1ff2</md5file>
-<md5file name="no.js">91ea847a2d6799362d42f6842ffd0b60</md5file>
-<md5file name="eu.js">acf11d5ee43e34d54947a24bcc02eaaa</md5file>
-<md5file name="uk.js">e785da7095ecca60e6b9649984688e6e</md5file>
-<md5file name="hr.js">7e46369bb88d6d8b2d55d16c583acd73</md5file>
-<md5file name="pt-br.js">51f6e34ec323eb9e003417adb0d74476</md5file>
-<md5file name="de.js">24e509c0d01c8f652c65fab4ff572a18</md5file>
-<md5file name="mn.js">0b9139f6d4c46512978588b50b9f5b62</md5file>
-<md5file name="sq.js">559b3f2ab4a0e72153b845c9a35394a3</md5file>
-<md5file name="ko.js">7aca76670d18b3bf392f1ca09d5ef5cb</md5file>
-<md5file name="is.js">853a12de071c16b0e6d7463c1f8cb36d</md5file>
-<md5file name="it.js">0b9d3005af00fc7352521d190566cfa9</md5file>
-<md5file name="th.js">160915df72fa239da18e104441bcd5a0</md5file>
-<md5file name="id.js">afffce62c275ef3c7da563b1793cdb13</md5file>
-<md5file name="nb.js">d7f1ad9d25ad83db76ea27cc7e1623ee</md5file>
-<md5file name="ja.js">3385b07f4c4412bc7077272a5f4d83cd</md5file>
-<md5file name="pl.js">ffae72e363845f60271c6b074d0ed824</md5file>
-<md5file name="ku.js">9b71a868ae0c914f09fa0096b3c4515f</md5file>
-<md5file name="cy.js">0046c0fee6bcacb1d339da94965d5481</md5file>
-<md5file name="hu.js">e62c15fd11e68b5efa68e42da4759197</md5file>
-<md5file name="ka.js">524273fc9581cdea1ae5903a9fe6d5eb</md5file>
-<md5file name="da.js">91b8d2f8495fda759c2546e1b29e8eaf</md5file>
-<md5file name="mk.js">6c594ea60e41a589c3c3e9a249e7d867</md5file>
-<md5file name="sv.js">9b4a6d91b45aa851c6000c2761794b15</md5file>
-<md5file name="lt.js">7958c3c13c671f83619e8ec23d8432cd</md5file>
-<md5file name="ru.js">c9d6808ec856e4e0ff15fb597340a067</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/plugins/preview" >
-<md5file name="preview.html">8c10865beddd7b64913db21f12059c64</md5file>
-<md5file name="plugin.js">c468deb0acd01bc010634d988e684e09</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source" >
-<md5file name="contents.css">16e626c7996b2957e8b64c186de9ca0d</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core" >
-<md5file name="dataprocessor.js">097b08708208ae1e5b0976fa576e21ba</md5file>
-<md5file name="plugins.js">b70e2b3d059d767893e8abd38648d785</md5file>
-<md5file name="env.js">1537329ac08c21bc452e988e95f7b634</md5file>
-<md5file name="eventInfo.js">5950b9e6e85d75c874ae0407cd1ac71d</md5file>
-<md5file name="ckeditor_base.js">a02f58f073844edb2e61f267257f5368</md5file>
-<md5file name="ckeditor_basic.js">0849eb9a2b28a2f6167c1dd33f480241</md5file>
-<md5file name="dtd.js">50e62e2fbc605e2196d1a0d446900463</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core/htmlparser" >
-<md5file name="basicwriter.js">ef0f206b527ff64cd44d20791dc7dada</md5file>
-<md5file name="filter.js">7eda495a66d481a45fe354e591859bc2</md5file>
-<md5file name="fragment.js">36ed2ed2060ed1dafe1c557ee86332a4</md5file>
-<md5file name="comment.js">a9a36f52f0294c0c81a33334e0d7e6a0</md5file>
-<md5file name="text.js">69cdff16107d3aca2e48b6b1f9542e93</md5file>
-<md5file name="element.js">e005ccaad2996a29de087e640a514449</md5file>
-<md5file name="cdata.js">72b633cedb07eab057d7831a241546c6</md5file>
-<md5file name="node.js">7a44b6dbb7459c2a40c93785aff44723</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core/creators" >
-<md5file name="themedui.js">468e7de9853cdb5570523d7e687e652a</md5file>
-<md5file name="inline.js">284c50448c5b454c99587b74c1a3818c</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core" >
-<md5file name="ckeditor.js">a3cd90cd2b7bb909ee13a42041ce4893</md5file>
-<md5file name="filter.js">0502867e190b3236948d109e02a2732a</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core/dom" >
-<md5file name="rangelist.js">7b021f7b0093f5f5bc0222d17a391da5</md5file>
-<md5file name="window.js">3536e5f1813e79e99d60ac152b758f29</md5file>
-<md5file name="elementpath.js">cef52f5c9ea95158c9288a038807d63a</md5file>
-<md5file name="documentfragment.js">5e2d7588d784973178c28860287eb756</md5file>
-<md5file name="comment.js">d193838abbf2439321c6b7cbc8a20e18</md5file>
-<md5file name="event.js">25b1f2c3c7cf8c31f6e9045694cea8ce</md5file>
-<md5file name="nodelist.js">a60f3f2c9b72e6a8b0a98733d9230785</md5file>
-<md5file name="iterator.js">457a102391650783431db06dd69b3e26</md5file>
-<md5file name="document.js">a56c3abfaf35aa9e194b0f90c66c819e</md5file>
-<md5file name="text.js">bc7c7d9647d26359534f1c6c5c553e8d</md5file>
-<md5file name="domobject.js">60879d6a0e051f089310fbc08c714bd8</md5file>
-<md5file name="walker.js">417757a90bd6b861b7e867abfee4d36e</md5file>
-<md5file name="element.js">662dca4734552a24c556c3dd65997f55</md5file>
-<md5file name="node.js">bbc7dac898f2d9150881320d5cb831d0</md5file>
-<md5file name="range.js">b82f5612164a6434f2dc79bfbd24cf5b</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/core" >
-<md5file name="style.js">7208e52ce0a5f9c2d809dc08f5fc34cd</md5file>
-<md5file name="resourcemanager.js">e22fb66f332dbd77ab3bbae0eceec1d5</md5file>
-<md5file name="focusmanager.js">7f761836020b1a3da1846ebeaa8cadb9</md5file>
-<md5file name="command.js">8988f4c78983609cb8715966f66f3982</md5file>
-<md5file name="event.js">2fcf9c4e9315ef74d8ac8acbad712f8b</md5file>
-<md5file name="_bootstrap.js">f5a54471eff0ba5a3ae4413dac555dd3</md5file>
-<md5file name="editable.js">117aaa05e6044dd393d9c3b781cce590</md5file>
-<md5file name="template.js">3e4b7393748ac9d418b3e8d1fa1ed709</md5file>
-<md5file name="commanddefinition.js">3874242716897a2f720ddae33efeb3ff</md5file>
-<md5file name="dom.js">f0880025694ed8d793355719c284b378</md5file>
-<md5file name="plugindefinition.js">ef1ea0ea7176bb66528d1f75ba419454</md5file>
-<md5file name="htmldataprocessor.js">84979903dccf511bf370510835e88b43</md5file>
-<md5file name="keystrokehandler.js">e5871705c64601f450e48e17a3c97573</md5file>
-<md5file name="config.js">44dce2769e4695722d904efbaa8af1e9</md5file>
-<md5file name="lang.js">60eb6c60d5307f0089e5924618a2fbdd</md5file>
-<md5file name="skin.js">eda4e25a66473cfb39968d9774738e53</md5file>
-<md5file name="ui.js">86d165dbcee84f04d67ce982889c1e62</md5file>
-<md5file name="htmlparser.js">ac56c8281862cc3a9d38f2e76651962b</md5file>
-<md5file name="editor_basic.js">ef1d7d9d4e23153d2bd0bff65f55f384</md5file>
-<md5file name="loader.js">f7b68824d78c6bf899539449869a8799</md5file>
-<md5file name="scriptloader.js">67556d8f154b04b52cb4ba3f4d057fc7</md5file>
-<md5file name="selection.js">5ea568e43554ec1102b2c6117325bb23</md5file>
-<md5file name="editor.js">977d3ef3a316bfe396a1e3361b17b202</md5file>
-<md5file name="tools.js">9acb463e4bde04a0f17f1d483bf209eb</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source/lang" >
-<md5file name="lv.js">4254d3baa0f050715478546c8a984764</md5file>
-<md5file name="cs.js">29cf76d442e78896984717946977542b</md5file>
-<md5file name="bg.js">b91921289a4962823752c793755cb0db</md5file>
-<md5file name="zh-cn.js">abec52f4168eff9fe26156c0c83b6426</md5file>
-<md5file name="km.js">89310aeabff45d8d0e3db15e5a544f97</md5file>
-<md5file name="sk.js">8ea4846250a7a10fe781793b447bd277</md5file>
-<md5file name="vi.js">e6d14fc770a9196d2ac80b9e98fa797c</md5file>
-<md5file name="tr.js">c282ff9b75524457d1162378a60a5a97</md5file>
-<md5file name="sl.js">a08ab2cb67aac27ed6dcd776c048163e</md5file>
-<md5file name="es.js">8d06e552954dfa9019f4025097e93a4f</md5file>
-<md5file name="si.js">989d31280c0befa91146e1d93f5d4a06</md5file>
-<md5file name="ms.js">4af44754cd8a9169ef110bc8819b26ba</md5file>
-<md5file name="fi.js">b2e9cc6b83b3972dac3b12190bc4527d</md5file>
-<md5file name="en-gb.js">c4a57e6c000e5ac94dd3d1f8157b3475</md5file>
-<md5file name="en-ca.js">d23bdaa2aff220798bdc37c80e0d0aaa</md5file>
-<md5file name="af.js">27fcaaf059a2640623e019aef81b5c66</md5file>
-<md5file name="ug.js">9bb50e250d516ceb772d613ec222a292</md5file>
-<md5file name="fo.js">f63a766693f795342782a2cb83495f36</md5file>
-<md5file name="en-au.js">8bde67bf893edf48a7614839a4bbf74b</md5file>
-<md5file name="fr-ca.js">2a19b807e0edae3d92332e2c5907efd6</md5file>
-<md5file name="bs.js">d08fb2b1a185a1c31e7846758affb0ae</md5file>
-<md5file name="ar.js">e250fb521b43a206d031acb2861b4dca</md5file>
-<md5file name="en.js">fd6d0fd255299d9ab256a2e571aa6bda</md5file>
-<md5file name="sr-latn.js">def61191ab83db3477794d077674cfc7</md5file>
-<md5file name="fr.js">2183e9eb46f48298a282345350b42a8a</md5file>
-<md5file name="zh.js">4cf5221981c2637550b84b6a5ae8e0fa</md5file>
-<md5file name="fa.js">0e170e254f338e246e49c03b9dd80c55</md5file>
-<md5file name="ca.js">135a64b167aed9c2ef3ccbc3026f4b73</md5file>
-<md5file name="pt.js">37bd5cd93e03be1990c87df15963cdf6</md5file>
-<md5file name="el.js">d33e0a98be45f2e9472e49ee9dd6f0e1</md5file>
-<md5file name="et.js">582ee00cda28fc0515827f70f9ba92b2</md5file>
-<md5file name="nl.js">36e12a977cc05cc827265e5ff03279e6</md5file>
-<md5file name="gl.js">a1414f9f8fcb238d28e70b44270a7a0a</md5file>
-<md5file name="he.js">85208c58f89620de2754fcc700c4a075</md5file>
-<md5file name="ro.js">8329dc000348b6694a0406078334afcf</md5file>
-<md5file name="sr.js">7e9da0dd3f40ca8657eabff869c9c8d8</md5file>
-<md5file name="gu.js">960dee22771d0e93cc816a38ad009f2f</md5file>
-<md5file name="bn.js">dca94f24bb85b0593f5a0933a0a3a7e0</md5file>
-<md5file name="eo.js">6d5e9c09b7b96beffa76410e7b045bfc</md5file>
-<md5file name="hi.js">d7133d4ece13b3bfc56a1bbcbdc1d8a9</md5file>
-<md5file name="no.js">ad575cc08912598f6f5e729bf877d838</md5file>
-<md5file name="eu.js">8ab6321edf9f8ea1238cc0560f052fc2</md5file>
-<md5file name="uk.js">64922d606f750c8600e7b9ecf07b7963</md5file>
-<md5file name="hr.js">ca2ccd3edfeaa2b32dfa7bb4077f0f36</md5file>
-<md5file name="pt-br.js">017b261abe8f6d2222d7f6c0fe12845c</md5file>
-<md5file name="de.js">587b5427eb5cb02d7112849ff94fef38</md5file>
-<md5file name="mn.js">7f7487e34636a5b2dd1659983fa44183</md5file>
-<md5file name="sq.js">1082f9fe5c2f6cbe5888d1d91badc664</md5file>
-<md5file name="ko.js">9b9244bd50d5b84971421633847fba54</md5file>
-<md5file name="is.js">ceaedc7d087c746507535d1c003af166</md5file>
-<md5file name="it.js">0644436d2ff4a3936688ab08df19fcea</md5file>
-<md5file name="th.js">c730dfefb17028709ecee2c815bdc154</md5file>
-<md5file name="id.js">a1915b568a6b7519e0043b4770179620</md5file>
-<md5file name="nb.js">805b19dd0996ca2000f73a119d711cd4</md5file>
-<md5file name="ja.js">a48aec0b4d383a1f2a92086ceb47ec48</md5file>
-<md5file name="pl.js">073f005cb7f0ca1fa0b3477b2b353eba</md5file>
-<md5file name="ku.js">3efaff7db482608044187093320b0757</md5file>
-<md5file name="cy.js">9858991322ee43e6a4ffd569553ebe80</md5file>
-<md5file name="hu.js">f6a1230bcf5d16ce03fa1b29a3df834d</md5file>
-<md5file name="ka.js">ffe13a2313344e30f82877a3416a0716</md5file>
-<md5file name="da.js">a04dfe23fe5e92ac0c8468b726b6e7c3</md5file>
-<md5file name="mk.js">32413e5ab84f9ad9c03ee1ae36a694df</md5file>
-<md5file name="sv.js">a6b361049e2d2bfc442f019c0ebe0d3e</md5file>
-<md5file name="lt.js">f60e1698f84fef6cceaf756526d35bc0</md5file>
-<md5file name="ru.js">31b036a3fe4b899112c6034ee419e9a7</md5file>
-</dir>
-<dir name="/includes/ckeditor/_source" >
-<md5file name="config.js">6bd070aff5e945045bde6a49cc92e512</md5file>
-<md5file name="styles.js">73791145fa71981a2f3a56fc5b22fbe4</md5file>
-</dir>
-<dir name="/includes/ckeditor" >
-<md5file name="config.js">35c63682b9f0ab3638c5e7c987e1a892</md5file>
-<md5file name="styles.js">d5e952f44c649481aa8597d2fd0159b3</md5file>
-</dir>
-<dir name="/includes/jquery/css/smoothness" >
-<md5file name="jquery-ui.css">64dfb75ef30cbf691e7858dc1992b4df</md5file>
-<md5file name="theme.css">a001312cbf93827d531c91c2610610f2</md5file>
-<md5file name="jquery-ui.min.css">840cca94d5e33faf324bcd4988fa8401</md5file>
-</dir>
-<dir name="/includes/jquery/css/smoothness/images" >
-<md5file name="ui-bg_glass_75_dadada_1x400.png">04646fb634cba8c8b6487d26200c5fcc</md5file>
-<md5file name="ui-bg_highlight-soft_75_cccccc_1x100.png">ac76811df9c1bf8af392f21e7cb9dff7</md5file>
-<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">d47047084ba4c0d911f6332bb664a292</md5file>
-<md5file name="ui-bg_flat_75_ffffff_40x100.png">cc546fa0a4b98fad0917c5693587bc6b</md5file>
-<md5file name="ui-icons_2e83ff_256x240.png">14d55152e99f22245c9e1e8bb784a7f6</md5file>
-<md5file name="ui-icons_888888_256x240.png">e63c67228df4a03cd91321bdf98e7555</md5file>
-<md5file name="ui-bg_glass_75_e6e6e6_1x400.png">7de5a7addad547244d33f4209e3d6306</md5file>
-<md5file name="ui-bg_glass_95_fef1ec_1x400.png">9a3f2305cb5cb2921ca7184bd955744e</md5file>
-<md5file name="ui-icons_cd0a0a_256x240.png">b00a65a4b157ec627ee9ff4d0c8f1176</md5file>
-<md5file name="ui-icons_222222_256x240.png">4c27b34156b7a3776f31cc456ca01c10</md5file>
-<md5file name="ui-bg_glass_55_fbf9ee_1x400.png">3c59f14abdbc105190b9db0ec30c232c</md5file>
-<md5file name="ui-bg_glass_65_ffffff_1x400.png">487b704edf1cf3ce0f8c153bb29652cf</md5file>
-<md5file name="ui-icons_454545_256x240.png">ec5e59da4b23573927bda544cbb29401</md5file>
-</dir>
-<dir name="/includes/jquery/css/ui-lightness" >
-<md5file name="jquery-ui.css">f635c10273900261c5f52f8fbd574bd2</md5file>
-<md5file name="theme.css">5588e19871bc8ef086ed20773e8a726f</md5file>
-<md5file name="jquery-ui.min.css">26812a28850395f8f865be4893fb20c7</md5file>
-</dir>
-<dir name="/includes/jquery/css/ui-lightness/images" >
-<md5file name="ui-bg_diagonals-thick_20_666666_40x40.png">ad50c108697ff83dd558748e1c9ea7f8</md5file>
-<md5file name="ui-icons_ef8c08_256x240.png">772a64d6df4b93d230e9b38e1ab7522a</md5file>
-<md5file name="ui-icons_228ef1_256x240.png">2f257489d9600ddf56d195a179ebc9df</md5file>
-<md5file name="ui-bg_highlight-soft_100_eeeeee_1x100.png">03bee68eecdc1d143e569e8517af3749</md5file>
-<md5file name="ui-bg_glass_100_f6f6f6_1x400.png">54064d41a49fe243986fecfc9ec046e7</md5file>
-<md5file name="ui-bg_diagonals-thick_18_b81900_40x40.png">592779e1e4a8aa19fe709b34050d3142</md5file>
-<md5file name="ui-bg_highlight-soft_75_ffe45c_1x100.png">9a8f7e2a56ba13b2501705f95a24eb84</md5file>
-<md5file name="ui-bg_flat_10_000000_40x100.png">70838ab03f80181fa093b46a5fbadffd</md5file>
-<md5file name="ui-icons_ffd27a_256x240.png">6686d21b904e18b100210169bb1c04ad</md5file>
-<md5file name="ui-bg_glass_100_fdf5ce_1x400.png">332ec194bd7357cb91329af979e396ae</md5file>
-<md5file name="ui-icons_222222_256x240.png">4c27b34156b7a3776f31cc456ca01c10</md5file>
-<md5file name="ui-bg_glass_65_ffffff_1x400.png">f480b208e508b20d5b652898d489dc43</md5file>
-<md5file name="ui-bg_gloss-wave_35_f6a828_500x100.png">e8ffc200d8522cb3f314ef7313a18f5a</md5file>
-<md5file name="ui-icons_ffffff_256x240.png">a19fe1b2d726e920c12e43a65df9039a</md5file>
-</dir>
-<dir name="/includes/jquery/css/redmond" >
-<md5file name="jquery-ui.css">5de561c1c27bb1453107348b9e92d977</md5file>
-<md5file name="theme.css">8494a94ad7948c50a669e62c8c08733e</md5file>
-<md5file name="jquery-ui.min.css">d6a56d252b964da228bb404668dee5ac</md5file>
-</dir>
-<dir name="/includes/jquery/css/redmond/images" >
-<md5file name="ui-bg_glass_85_dfeffc_1x400.png">112568d2753ad95785e341d36cefcb70</md5file>
-<md5file name="ui-bg_inset-hard_100_f5f8f9_1x100.png">fbd7d8dabfa60c6d61bcb823abf5222a</md5file>
-<md5file name="ui-icons_469bdd_256x240.png">080b00f6697b0f7833ba8120cad52c6a</md5file>
-<md5file name="ui-bg_flat_0_aaaaaa_40x100.png">b6a05b4421a9c33a4f192aa76572d41a</md5file>
-<md5file name="ui-bg_inset-hard_100_fcfdfd_1x100.png">f69a174582a503bef24e2abf6612bd7f</md5file>
-<md5file name="ui-icons_2e83ff_256x240.png">14d55152e99f22245c9e1e8bb784a7f6</md5file>
-<md5file name="ui-icons_217bc0_256x240.png">32e2393f2396da0a6c6ee53d47082645</md5file>
-<md5file name="ui-bg_glass_75_d0e5f5_1x400.png">f826d3df9d67db8817530da59f9771b5</md5file>
-<md5file name="ui-bg_flat_55_fbec88_40x100.png">ebe8f4b28bfcbb4c60ce10a22eeb2c6d</md5file>
-<md5file name="ui-bg_gloss-wave_55_5c9ccc_500x100.png">ced970610f0690c509e5bf6ffb43c9e8</md5file>
-<md5file name="ui-bg_glass_95_fef1ec_1x400.png">c41fe8e9026b84ca2ab9b8878f7656be</md5file>
-<md5file name="ui-icons_cd0a0a_256x240.png">b00a65a4b157ec627ee9ff4d0c8f1176</md5file>
-<md5file name="ui-icons_6da8d5_256x240.png">a7214cd935445d287135563231dff356</md5file>
-<md5file name="ui-icons_d8e7f3_256x240.png">f6757d92918ca3958efce37d8ee7eb1d</md5file>
-<md5file name="ui-icons_f9bd01_256x240.png">1c022347540410dd9bcf1f37dbf11f6e</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jqueryFileTree" >
-<md5file name="jqueryFileTree.css">4effee5b896fb71cb6d9106340118b7c</md5file>
-<md5file name="jqueryFileTree.js">90e40fe8ce59e8284a89bc54e2076deb</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jqueryFileTree/images" >
-<md5file name="php.png">48cda2a2a54a31f7a666547c862c12e7</md5file>
-<md5file name="code.png">c65fadae5a0fc27f401f1a00e66f518f</md5file>
-<md5file name="html.png">12ace1a918403049a6d2fc152f53baec</md5file>
-<md5file name="xls.png">7363cb7630d1d4b441183345fd15ae62</md5file>
-<md5file name="ppt.png">8c366c11adee3cf2988614df4c96782b</md5file>
-<md5file name="file.png">a3112ba7e266938321394347e2a6e107</md5file>
-<md5file name="doc.png">38af291953d5b90b0aee30dd0d2126a4</md5file>
-<md5file name="spinner.gif">9a8269421303631316be4ab5e34870e1</md5file>
-<md5file name="java.png">ac467ef8defc620b6b5eb80d2047bcb7</md5file>
-<md5file name="folder_open.png">bf30d89d69dddfbd8e5f805a199c407f</md5file>
-<md5file name="ruby.png">661505d2efc05b2347492e4949f564d5</md5file>
-<md5file name="film.png">5ad12582e3ca901894737c3dd44a5eb2</md5file>
-<md5file name="flash.png">132a505684e7b7b91f50ea29c072112b</md5file>
-<md5file name="db.png">03e2b564224bfb58ff20904bda244043</md5file>
-<md5file name="css.png">783f5b06082bf73e9d1eaf79d838162f</md5file>
-<md5file name="picture.png">d2040c34ba1ffd8fa5b72ab37be11eca</md5file>
-<md5file name="application.png">fc517da02d6a64a68e5fea9a5de472f1</md5file>
-<md5file name="txt.png">0da66bdb013f9a9d12ce7219e642bc25</md5file>
-<md5file name="pdf.png">5ee15843554004d12736f0404f8d443a</md5file>
-<md5file name="psd.png">787a96924e9b114e75f48b540ff480a2</md5file>
-<md5file name="script.png">13ad2158a4889c26a851f99b261e4c5c</md5file>
-<md5file name="zip.png">2eba6780fc7d3663bc44808480c6bd8a</md5file>
-<md5file name="linux.png">73c25b185fb78cc690675cd4a181ee0b</md5file>
-<md5file name="directory.png">fbd3929a893b147ae0940d48d533e023</md5file>
-<md5file name="music.png">bd2244ac282a5ada48b0d79cacc59426</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/select2" >
-<md5file name="select2_locale_eu.js">be7c3c0f4cf51faf0a543446b97d2c55</md5file>
-<md5file name="select2_locale_ug-CN.js">f7e2467d8c6614a748e8629cb60614b0</md5file>
-<md5file name="select2_locale_ro.js">f2be13d5e99973c73059b469fd10cb04</md5file>
-<md5file name="select2.jquery.json">d16668a2d16b057f04eb2f93372bf631</md5file>
-<md5file name="select2_locale_es.js">fd5f09f2fb6e899777af95c277ff8c60</md5file>
-<md5file name="select2x2.png">49e3f006018662f60f1db2aec0b2cca9</md5file>
-<md5file name="select2_locale_fi.js">9ebf1d0182dd9eaafad691698d6b5a04</md5file>
-<md5file name="composer.json">e45762e446e2f0cb2bef724fa339b4d6</md5file>
-<md5file name="select2_locale_nl.js">820f48fdead90505fa70b4e47b2c652a</md5file>
-<md5file name="select2_locale_is.js">8cef2db6f12ac34456d346f4f0df3bcc</md5file>
-<md5file name="select2_locale_sk.js">2341f2c853fbbb21188c6b2c2f7064b8</md5file>
-<md5file name="select2_locale_uk.js">fc4180203086f4db5723547477eb472f</md5file>
-<md5file name="select2.min.js">43ea1dd926d28fb13254881c45cd313f</md5file>
-<md5file name="select2_locale_pt-PT.js">857cc080b63fbdb946570312693498f5</md5file>
-<md5file name="select2_locale_hr.js">a67be66f984c8e31cfad2c93fb5d0a1d</md5file>
-<md5file name="select2_locale_ko.js">c8dda8025928ac2a82206adb6aea2fd6</md5file>
-<md5file name="select2_locale_nb.js">feb67f9cef255056d3c1efa088faf1f3</md5file>
-<md5file name="select2_locale_rs.js">817762ea9da214f1f4584401ccd51374</md5file>
-<md5file name="select2.png">2ca61b76e22053571dd8611e5aac4900</md5file>
-<md5file name="select2_locale_pl.js">3c01f20e2abba61bf212d959f0b70143</md5file>
-<md5file name="select2_locale_de.js">953a8f4b78d06742b24778ad0fafd7fc</md5file>
-<md5file name="select2_locale_mk.js">c87720a8b6da87848cf717971cf8e28d</md5file>
-<md5file name="select2_locale_fr.js">bc8bf1b085afb48f0a833f55bc7a092b</md5file>
-<md5file name="select2-bootstrap.css">0fe870dbba4c1e71c7bc3bd764ac6648</md5file>
-<md5file name="select2_locale_et.js">9c63e7fcef29b28590f35af932505ab1</md5file>
-<md5file name="select2_locale_fa.js">0a363eb48ab32888d2ccded705697e3b</md5file>
-<md5file name="select2_locale_he.js">b8285c08b99e9db14a03e1fec65fd080</md5file>
-<md5file name="select2_locale_ja.js">88d9eb0ff69518f9acd61ada0912104e</md5file>
-<md5file name="bower.json">30bf39efa0692914e6ddb6443425a173</md5file>
-<md5file name="select2_locale_ar.js">1f367bfbbc77e33c28beb1b3f1a5f88a</md5file>
-<md5file name="select2_locale_lv.js">0a2438f2726be075c1c1519f918f3215</md5file>
-<md5file name="select2_locale_tr.js">65d6c6f25dc89018dc74262179cd56ad</md5file>
-<md5file name="select2_locale_it.js">08a9454e4631ec0d88335265d8dfa2ac</md5file>
-<md5file name="select2_locale_cs.js">b52db318cfca6f9e1eb261af3e650ef4</md5file>
-<md5file name="select2_locale_vi.js">ce82206856d06c84b34b4750cf97fdf9</md5file>
-<md5file name="select2_locale_bg.js">244c2a76da3dd075f12892010b51429d</md5file>
-<md5file name="select2_locale_zh-CN.js">81534c478c919097a58b0154664c1ee2</md5file>
-<md5file name="select2_locale_ms.js">cbcec86b5b111de63a9408378ceabf1f</md5file>
-<md5file name="select2.js">79b1f2c9d5d8d3ffdfa3a1b3ca3eaa85</md5file>
-<md5file name="select2_locale_sv.js">cc519c456cb22964a334a6b41ad86e0b</md5file>
-<md5file name="select2_locale_da.js">907f37e8b7df4713213a505f28d6467d</md5file>
-<md5file name="select2_locale_ca.js">572748bcdafddcef34ad0be34ef144f9</md5file>
-<md5file name="select2_locale_ka.js">785563ea1eb9f66d8be27cc41ee95f6e</md5file>
-<md5file name="select2_locale_hu.js">d01a7384c6e8436fb43e0bcb2df770bf</md5file>
-<md5file name="select2_locale_id.js">32663e0333fcfb98bbcd3c2073f8aa5d</md5file>
-<md5file name="select2_locale_gl.js">82ba001c7bcea7af62c33d716b0c9bfa</md5file>
-<md5file name="component.json">1cc5116a76477d8f0f5de2efae29cc3c</md5file>
-<md5file name="select2_locale_az.js">6157b46b1a107982913ab0320c36b7a4</md5file>
-<md5file name="select2_locale_lt.js">d0788051f22804e9f4f323d2c6a2a0f4</md5file>
-<md5file name="select2-spinner.gif">7b9776076d5fceef4993b55c9383dedd</md5file>
-<md5file name="select2.css">b9d0598b4e1c295dc5466f6e55b59579</md5file>
-<md5file name="select2_locale_ru.js">1a39c6f2fbad7f8ec87a16b41f10e4f9</md5file>
-<md5file name="select2_locale_el.js">4f26ce66c3f271d8055c7416b3f4ec82</md5file>
-<md5file name="select2_locale_zh-TW.js">4c8498c7c7c582df2fe30520e64d8656</md5file>
-<md5file name="select2_locale_pt-BR.js">ae9696e232037d480c25f242f0dad26e</md5file>
-<md5file name="package.json">8ab6c24f02ec882d1a900b9151ce32ad</md5file>
-<md5file name="select2_locale_th.js">4e0326a0563bd2fc38a1b14e47fc7ded</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/tiptip" >
-<md5file name="jquery.tipTip.js">cd7073388fcbd89d17adc9e9b6489c40</md5file>
-<md5file name="jquery.tipTip.min.js">6eb77adc1ed55d94c3c598d424843dd1</md5file>
-<md5file name="tipTip.css">ff683986021d3aea2c2e0824d3912882</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/layout" >
-<md5file name="jquery.layout.min.js">b6842303b5db9a73d47bd59b81f3032d</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/mobile" >
-<md5file name="jquery.mobile-latest.min.css">9d53983237bffff6a75dbdb2e883082e</md5file>
-<md5file name="jquery.mobile-latest.min.js">3c66dfba890ce9f8819b909bbaf6bec2</md5file>
-<md5file name="jquery.mobile-latest.js">6e3293266f645e19a91e415f8418aa49</md5file>
-<md5file name="jquery.mobile-latest.css">2d3c4d442a16d6402ba14307eca0cdb8</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/mobile/images" >
-<md5file name="icons-36-black.png">0266cfef4017307566e781d815ca07f4</md5file>
-<md5file name="icons-18-white.png">bcc3797b5ee26595de904538fe84e289</md5file>
-<md5file name="icons-18-black.png">26567c0e378766f38baf34bbc73cf0dd</md5file>
-<md5file name="icons-36-white.png">cbda6a0e1afde69875c104f6e809f1b1</md5file>
-<md5file name="ajax-loader.gif">08a3028fda91d443f4d5e93307c96fcd</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/tablednd" >
-<md5file name="jquery.tablednd.0.6.min.js">91355952bf808fedc051c1a96decc2ef</md5file>
-<md5file name="jquery.tablednd.0.6.js">9bb2d1bce5ca6c1dab92e70aa744344f</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jeditable" >
-<md5file name="jquery.jeditable.js">f0b2d2ec92fbee68080605d968cf45fc</md5file>
-<md5file name="jquery.jeditable.ui-autocomplete.js">fa9079fe13a4db2dd6140d5d7112375f</md5file>
-<md5file name="jquery.jeditable.ckeditor.js">6309fb06dc9f3d55d762718d30fa5f48</md5file>
-<md5file name="jquery.jeditable.ui-datepicker.js">969a6640722a1ab4b936c07c99a2e6c3</md5file>
-<md5file name="jquery.jeditable.min.js">4f332fdf2de4e25eb3f5611bf7b6c354</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jpicker/css" >
-<md5file name="jPicker-1.1.6.css">739b03158aa5894431ecad1c8fa1c82f</md5file>
-<md5file name="jPicker-1.1.6.min.css">da93d8095a72b3b2acbb64290dfdc716</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jpicker" >
-<md5file name="jPicker.css">a3f6bf488479d822864c6346c895c623</md5file>
-<md5file name="jpicker-1.1.6.js">9c9723b05901c04d7bf4d62630c4dc85</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jpicker/images" >
-<md5file name="preview-opacity.png">ab27137e3f7161c011a7b8bb89782c73</md5file>
-<md5file name="NoColor.png">e87e86990aa254a676d19240d7707204</md5file>
-<md5file name="bar-opacity.png">ca51657e035c8ec7101a2ba3e4fb027c</md5file>
-<md5file name="Maps.png">db163b6d98c20097ec791f4d7dd938fd</md5file>
-<md5file name="picker.gif">d88c26dca0ca8c159befb1a4f91a817c</md5file>
-<md5file name="rangearrows.gif">33873ca90e5739a504ea50ed6c675eb9</md5file>
-<md5file name="mappoint.gif">9f6dd30bc97b892fbd971271d1a82ce7</md5file>
-<md5file name="map-opacity.png">47d63ecea460265f78ab03b88d2b0b10</md5file>
-<md5file name="AlphaBar.png">5c5791930e0644f718c68296a62251cd</md5file>
-<md5file name="Bars.png">fe1c7cbad0cbc0e2d90a0291658dbbcb</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jpicker" >
-<md5file name="Example.html">f505cb61cdfe745c5e4d7c74471e267e</md5file>
-<md5file name="jpicker-1.1.6.min.js">955a446a7362ce4ee8d73acee3ef9790</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/colorpicker" >
-<md5file name="jquery.colorpicker.css">efbd0fc3617ddb7d7f31ce74f2e2162e</md5file>
-<md5file name="jquery.colorpicker.js">c01d40afca257245eb8374dece73e0c0</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/timepicker" >
-<md5file name="jquery-ui-timepicker-addon.css">4c4e6b894efc6381846a0764f1e70f77</md5file>
-<md5file name="jquery-ui-timepicker-addon.js">7ec9405a31291a374be5a10b11b4d146</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/css" >
-<md5file name="jquery.fileupload-ui.css">dd3692f9ad17ca6a2a49b6ad446a1eb7</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/img" >
-<md5file name="progressbar.gif">2165b99c89c8431e7165530ccb5f89fb</md5file>
-<md5file name="loading.gif">05992d3434d3589b38a3a5431842d38f</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/js" >
-<md5file name="jquery.fileupload-fp.js">ebd0cfcbbb8e8ececa8f05617a98b324</md5file>
-<md5file name="locale.js">a3e000456648ad121c8aadf7d918a4e7</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/js/vendor" >
-<md5file name="jquery.ui.widget.js">bfd10864f928c910add9a134c48c003f</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/js" >
-<md5file name="jquery.fileupload.js">75e009a1fe815df846b1279590cb207f</md5file>
-<md5file name="jquery.iframe-transport.js">f5e90c30ee80102ae8d460878f8aa080</md5file>
-<md5file name="main.js">2d22c61e44fc9adb7315b121f8496708</md5file>
-<md5file name="jquery.fileupload-ui.js">ed19ac112bb57caba9d0d43886216071</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/js/cors" >
-<md5file name="jquery.postmessage-transport.js">11fe256b13a09546f7280198d8e98239</md5file>
-<md5file name="jquery.xdr-transport.js">0927262e8bbd59ec33eda07237e6f19a</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/fileupload/js" >
-<md5file name="jquery.fileupload-jui.js">f8bc7ca757d08b874579797ef5925bcd</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jnotify" >
-<md5file name="jquery.jnotify-alt.min.css">599a8439ed6125670db4a61b4f93b406</md5file>
-<md5file name="jquery.jnotify.min.js">cdfa64990c808af7009d75478134f966</md5file>
-<md5file name="jquery.jnotify.js">b955200005bc73bec30a42c1d1df16d9</md5file>
-<md5file name="jquery.jnotify.min.css">eac70f4024955fbba9bd6a6e94cae7db</md5file>
-<md5file name="jquery.jnotify.css">8bc18a7b64cde9d8fd204e30a8ad7172</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/blockUI" >
-<md5file name="jquery.blockUI.js">5c98c0cbfacee6dab0783112cb0e233d</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jcrop/css" >
-<md5file name="jquery.Jcrop.css">3888e9f93e218814c97a146069d104f1</md5file>
-<md5file name="Jcrop.gif">7a4b4c6ebdb549fcbe47408f9457493e</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jcrop" >
-<md5file name="index.html">69f1f3e08eaa1371f74e265511deeaa4</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jcrop/js" >
-<md5file name="jquery.Jcrop.min.js">ead9e5f733592ae8f9b227507de37ee6</md5file>
-<md5file name="jquery.Jcrop.js">ed882314c841932770eab4413337b4b0</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jquerytreeview" >
-<md5file name="jquery.treeview.sortable.js">d529d0aa82ed3aa96944387904ce88d3</md5file>
-<md5file name="screenshot.png">04a3ab30b80f9112937f2d586a622c55</md5file>
-<md5file name="jquery.treeview.edit.js">11b9e8e10d8acb2cd1addb502efc7f89</md5file>
-<md5file name="jquery.treeview.async.js">e8c268d38f2cfa22121c876022676cb4</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jquerytreeview/lib" >
-<md5file name="jquery.cookie.js">8300eb5446df027b01ddd21e03c361b4</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jquerytreeview/images" >
-<md5file name="treeview-black-line.gif">0cdd968bdb2f2852ec71e0264b3292cc</md5file>
-<md5file name="minus.gif">e009322a00011359f76cf7ae59b4d33d</md5file>
-<md5file name="treeview-famfamfam-line.gif">18b3e43abad26bdac6f4cea944777b62</md5file>
-<md5file name="plus.gif">6c46b98e0c60e6dc2ef14f9d4a6607b8</md5file>
-<md5file name="treeview-default.gif">46878a9b3ede269c4e234550c9c89cd0</md5file>
-<md5file name="treeview-gray.gif">02b42894653cfd82e52aac669ad078ed</md5file>
-<md5file name="folder-closed.gif">262d69b7ca267be1994fca2aba46be32</md5file>
-<md5file name="treeview-famfamfam.gif">dc335e786863262f594737e26198009c</md5file>
-<md5file name="treeview-red-line.gif">feda280e7bffb057ca4c87491aab6943</md5file>
-<md5file name="treeview-red.gif">c94a07253c14c98fe69dffafb59228a5</md5file>
-<md5file name="file.gif">9ab0e28d85d8ab5eb954fc28f6ac1e80</md5file>
-<md5file name="treeview-gray-line.gif">9c2613b4de53f939bc770983976f66cd</md5file>
-<md5file name="folder.gif">9f41e1454905fd7416f89aa4380a65e1</md5file>
-<md5file name="treeview-default-line.gif">5e3c0e0c48f48c23c45aef7b72c739c0</md5file>
-<md5file name="ajax-loader.gif">30d8e72bfdae694b1938658e1b087df0</md5file>
-<md5file name="treeview-black.gif">a3ffb8abd978b0464f7b5b508fcfdef0</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/jquerytreeview" >
-<md5file name="jquery.treeview.css">9dd0da9a4d871790529883dc56679b75</md5file>
-<md5file name="jquery.treeview.js">db5cf23edb637b47a757468a06e6a717</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/flot" >
-<md5file name="jquery.flot.navigate.min.js">deba38d5ced26f81b023389233eafcef</md5file>
-<md5file name="excanvas.min.js">ee9e3fee14270b7b27fcaa0e2cf2e042</md5file>
-<md5file name="jquery.flot.canvas.min.js">2117410817385079bb44523d472c4395</md5file>
-<md5file name="excanvas.js">e5b3968f64661f1893cf740191e959c5</md5file>
-<md5file name="jquery.colorhelpers.min.js">d1c7eeeaaa602164df3f1cb5aaca5a26</md5file>
-<md5file name="jquery.flot.navigate.js">0fd6d20c90a468fd43d5573542cfab4b</md5file>
-<md5file name="jquery.flot.time.js">6a49d955cbc76f5c2fecce8a185f6291</md5file>
-<md5file name="jquery.flot.crosshair.js">78077b855f710839538571453a245a33</md5file>
-<md5file name="jquery.flot.errorbars.js">73fcfdc8eb3b79de42e4e9a009749127</md5file>
-<md5file name="jquery.flot.threshold.min.js">6c59b644fd0c0bfefdbf8ae1feb79285</md5file>
-<md5file name="jquery.flot.resize.min.js">31e21fd1856200b80b1ed9f64f78dee0</md5file>
-<md5file name="jquery.flot.categories.js">b404141c778bcfa27d02f943352fbc4e</md5file>
-<md5file name="jquery.flot.symbol.min.js">f24ebe4ddc2b92c2f563ccad40dc56c7</md5file>
-<md5file name="jquery.flot.symbol.js">ca6ad22013ca6285353f1cf0ed07b90e</md5file>
-<md5file name="jquery.flot.categories.min.js">ca6ccf0c7988a62a59b95b5d54cceb3e</md5file>
-<md5file name="jquery.colorhelpers.js">88e3b66abe16e03c573a0c969dde3f3c</md5file>
-<md5file name="jquery.flot.selection.js">6e4a2701adaf2ace52c100aba5c3eace</md5file>
-<md5file name="jquery.flot.fillbetween.js">84e8ec6c5278063e64ee6e574190303a</md5file>
-<md5file name="jquery.flot.canvas.js">a8710d08b758015617c9518fcad90a69</md5file>
-<md5file name="jquery.flot.js">89bc8ea971e99653717fa69a73d70bb4</md5file>
-<md5file name="jquery.flot.image.min.js">b990f2654a3c25307b53ee8e6cab972e</md5file>
-<md5file name="jquery.flot.stack.js">76945205e6094cc16871aef9b27606d7</md5file>
-<md5file name="jquery.flot.time.min.js">0881020d81c98c180dbc32bcfda83f0a</md5file>
-<md5file name="jquery.flot.stack.min.js">36efc25bd21112ead30b411a7ebe3054</md5file>
-<md5file name="jquery.flot.errorbars.min.js">dd1716d6ebeb7fabd861df3567a39a71</md5file>
-<md5file name="jquery.flot.selection.min.js">95a3d65bcf192081de779cf234e00d3f</md5file>
-<md5file name="jquery.flot.crosshair.min.js">3dd08a3b6a41baa85b81f6d775c396c1</md5file>
-<md5file name="jquery.flot.pie.min.js">4c5dd184344ef5b4b80d3cb5208d0fdc</md5file>
-<md5file name="jquery.flot.image.js">2947d3bde8e2384bd85e3faf6f44c433</md5file>
-<md5file name="jquery.flot.pie.js">62dbbef98865feaa20a7f936c56ab931</md5file>
-<md5file name="jquery.flot.min.js">9927ea93540a2a08b3c5125ff2126102</md5file>
-<md5file name="jquery.flot.resize.js">826b0d2739932ac103bf420dbadd048e</md5file>
-<md5file name="jquery.flot.fillbetween.min.js">298b75e124b11f0a23b859dc0587f65e</md5file>
-<md5file name="jquery.flot.threshold.js">acee3dea7eab3e1637f64ee5fa5adb98</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/Scroller/css" >
-<md5file name="dataTables.scroller.min.css">0b042fc81678cbd19c8abb92b5103f57</md5file>
-<md5file name="dataTables.scroller.css">6e08a6d7fb0a444452c0fa0b7a116fef</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/Scroller/images" >
-<md5file name="loading-background.png">af6ecc0b9ff73f313dbed7ff84adf1d6</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/Scroller/js" >
-<md5file name="dataTables.scroller.min.js">23a9a8cd4ad04740ccd23f95847c6c9f</md5file>
-<md5file name="dataTables.scroller.js">06f224c038a7c70a66959dd158aa1916</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/AutoFill/css" >
-<md5file name="dataTables.autoFill.css">d78cb46f77e10749abcc704063caaf1c</md5file>
-<md5file name="dataTables.autoFill.min.css">7c251e5cd4a8c34468c0fcb99a5c88fa</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/AutoFill/images" >
-<md5file name="filler.png">2d0e3d93c21b8ebbeb771962e7cacf26</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/AutoFill/js" >
-<md5file name="dataTables.autoFill.min.js">7bb8463da4969ec3a4c82bb789916ed5</md5file>
-<md5file name="dataTables.autoFill.js">400c85d933b945516f04e3c186adc55e</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/ColVis/css" >
-<md5file name="dataTables.colvis.jqueryui.css">dfc942b5fb2c1bdbcc54a7cb432d86a8</md5file>
-<md5file name="dataTables.colVis.min.css">8bcc4a0bed13b9d05c56db58e0680d57</md5file>
-<md5file name="dataTables.colVis.css">b7c712b5b68f3bfcb471598c7594ef21</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/ColVis/js" >
-<md5file name="dataTables.colVis.min.js">5152e016c133876dde1ed60cc7b2d4a7</md5file>
-<md5file name="dataTables.colVis.js">88c8974481d9add330405f514fb0eb48</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/KeyTable/css" >
-<md5file name="dataTables.keyTable.css">76823ed878d01530c378b9a58572e7c1</md5file>
-<md5file name="dataTables.keyTable.min.css">57bb5087f4d140d79a02a9ca5ce1b7be</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/KeyTable/js" >
-<md5file name="dataTables.keyTable.js">79119d731c1f1cc2ce58e440b0013d70</md5file>
-<md5file name="dataTables.keyTable.min.js">a1d169f04a1b957207f54edf9e0c9669</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/Responsive/css" >
-<md5file name="dataTables.responsive.css">8fa6f4c97214a80551d5d64a3d0dc23a</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/Responsive/js" >
-<md5file name="dataTables.responsive.min.js">5fc760b91eaffae0a22cf50e8c3c564a</md5file>
-<md5file name="dataTables.responsive.js">11ce3e94e64e2857f52d140951bea9a8</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/FixedColumns/css" >
-<md5file name="dataTables.fixedColumns.min.css">194c3762df658fd5e90b39903c937591</md5file>
-<md5file name="dataTables.fixedColumns.css">f8b43930c3106bab712c7d995a4a3d32</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/FixedColumns/js" >
-<md5file name="dataTables.fixedColumns.js">cc0b9f643aec57a61ae55699081531e3</md5file>
-<md5file name="dataTables.fixedColumns.min.js">333835b4607aba4adb0706cb54a5c8ee</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/FixedHeader/css" >
-<md5file name="dataTables.fixedHeader.min.css">27d54e112994921feadb245eb5a84f18</md5file>
-<md5file name="dataTables.fixedHeader.css">89fcfc0e0d5de89565e85821f69e2a4f</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/FixedHeader/js" >
-<md5file name="dataTables.fixedHeader.js">93f8261da7477c580a91c8215fe22c9e</md5file>
-<md5file name="dataTables.fixedHeader.min.js">06d0aeb141d18cf5d92d6cba2b581a0a</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/ColReorder/css" >
-<md5file name="dataTables.colReorder.min.css">e8038cbcbc4aadc9d8aeb58bb794b87a</md5file>
-<md5file name="dataTables.colReorder.css">6adfe3348c402bf2f079662941ce9770</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/ColReorder/images" >
-<md5file name="insert.png">8c086d220022ed8a1af377485f653ef7</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/ColReorder/js" >
-<md5file name="dataTables.colReorder.min.js">42721df869bef756071de3cc373315bd</md5file>
-<md5file name="dataTables.colReorder.js">4748f87c1325e22ca829833889e91771</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/TableTools/css" >
-<md5file name="dataTables.tableTools.min.css">1e42303ba72c5d6b7abb43724e976e37</md5file>
-<md5file name="dataTables.tableTools.css">f78b8d4456109fe316234ca0f5cc8082</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/TableTools/images" >
-<md5file name="xls.png">e7db69e4cae5a975d12a9922bd62855c</md5file>
-<md5file name="xls_hover.png">cc50cef418d070dc204157ea11f44ee8</md5file>
-<md5file name="pdf_hover.png">fee93c289a49bd1a98399b9bdadf4627</md5file>
-<md5file name="copy_hover.png">0fc278d1ef776f8c1edbc7ab272fd850</md5file>
-<md5file name="print_hover.png">4dded8247005cc26a611a713fdd31335</md5file>
-<md5file name="csv_hover.png">04a1cb8a2794a605461f8211fe46738c</md5file>
-<md5file name="collection.png">b8b601fbe718b934ec74e2e910c28afa</md5file>
-<md5file name="copy.png">49816c1abbb0646aa7fadaea57cc2d3e</md5file>
-<md5file name="pdf.png">b2c9c2e53dbe4590899b644e74e21cec</md5file>
-<md5file name="print.png">b12a9855f2b25f5a770753ddf9546b4d</md5file>
-<md5file name="csv.png">04bf5d1e88e09bb87b8d51a7411e5dab</md5file>
-<md5file name="collection_hover.png">aa2e592ba6fa4024a2e5adb63e4d2f6f</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/extensions/TableTools/js" >
-<md5file name="dataTables.tableTools.js">ca77964cf998db4f318d17e9c499b57b</md5file>
-<md5file name="dataTables.tableTools.min.js">3786f5909b2e6b391b91e1fcb60364c3</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/images" >
-<md5file name="forward_enabled_hover.png">9be5f327f16bcad317c8ad0ae92635d8</md5file>
-<md5file name="back_disabled.png">574c1fdbe98e07b336aeee94514cba7f</md5file>
-<md5file name="forward_enabled.png">a8c664b8219ffde978db3d8308713975</md5file>
-<md5file name="forward_disabled.png">72ead25432b5a84031b8333aa5fbf259</md5file>
-<md5file name="sort_asc_disabled.png">64f2d23d70cb2b2810031880f554b13c</md5file>
-<md5file name="back_enabled.png">2998e23d43af7c7857149b0e725ccad6</md5file>
-<md5file name="back_enabled_hover.png">9d29134dd5e1c2192916ef9104dd877e</md5file>
-<md5file name="sort_desc_disabled.png">d48475e6c742940f44e62622e16865b9</md5file>
-<md5file name="sort_both.png">94b34ff5224ba38210d67623bb1a1504</md5file>
-<md5file name="sort_desc.png">8f88d990024975797f96ce7648dacd2f</md5file>
-<md5file name="sort_asc.png">6c56b94fd0540844a7118cdff565b0ae</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/media/css" >
-<md5file name="jquery.dataTables_themeroller.css">99fd601e55bde8813c8249fdd5b41c89</md5file>
-<md5file name="jquery.dataTables.css">05951ed23a49dc8ac5fa2ef80e7d40a4</md5file>
-<md5file name="jquery.dataTables.min.css">c7c56d1536328705d44d6dea0ad48caf</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/media/images" >
-<md5file name="sort_asc_disabled.png">d7dc10c78f23615d328581aebcd805eb</md5file>
-<md5file name="sort_desc_disabled.png">bda51e15154a18257b4f955a222fd66f</md5file>
-<md5file name="sort_both.png">9a6486086d09bb38cf66a57cc559ade3</md5file>
-<md5file name="sort_desc.png">1fc418e33fd5a687290258b23fac4e98</md5file>
-<md5file name="sort_asc.png">9326ad44ae4bebdedd141e7a53c2a730</md5file>
-</dir>
-<dir name="/includes/jquery/plugins/datatables/media/js" >
-<md5file name="jquery.js">b091a47f6b91e26c93a848092c6f3788</md5file>
-<md5file name="jquery.dataTables.js">81d54087b880530de6c1fe2a59c07b6f</md5file>
-<md5file name="jquery.dataTables.min.js">280ff6aaaba888ccb486e669fd200b8e</md5file>
-</dir>
-<dir name="/includes/jquery/js" >
-<md5file name="jquery-ui.js">04a4db2983450a2970c459ba87b4210a</md5file>
-<md5file name="jquery.min.js">895323ed2f7258af4fae2c738c8aea49</md5file>
-<md5file name="jquery-ui.min.js">d935d506ae9c8dd9e0f96706fbb91f65</md5file>
-<md5file name="jquery.js">7f38dcbfb11aff050652ff3b754adb63</md5file>
-</dir>
-<dir name="/includes/tcpdf" >
-<md5file name="composer.json">3c06688411baa451d053f64eeccb1834</md5file>
-<md5file name="tcpdf_autoconfig.php">bcb93bbeb8cf2831e49ff5541d277a1f</md5file>
-<md5file name="tcpdf_barcodes_1d.php">d306e9ad7b8b67464493c3281417afdc</md5file>
-<md5file name="tcpdf_import.php">6bb88a8a3d69511d1bf9e7af12ab5f47</md5file>
-</dir>
-<dir name="/includes/tcpdf/fonts" >
-<md5file name="freemono.php">2652ce7b4dcf00a1b07d8b1debedf867</md5file>
-<md5file name="dejavusanscondensedi.php">a1775d6ba3d8b76629dcdc2c1006048b</md5file>
-<md5file name="pdfasymbol.php">a874a391c41c223a007297af0fc82d71</md5file>
-<md5file name="uni2cid_ag15.php">0f6007361d5e4c8f34a2e83d402567b1</md5file>
-<md5file name="times.php">a75033315ee90464410b47cc27ce9ff0</md5file>
-<md5file name="dejavusansextralight.php">bc1d75d2d4988d2ad9cac651bc44b8b3</md5file>
-<md5file name="pdfahelveticab.php">36cc4107f0d39d89b8031042c4159468</md5file>
-<md5file name="timesi.php">8fd8e9a11cca513a4da0f25ff1a24149</md5file>
-<md5file name="dejavusansmono.php">5af577705b43ce01285f2721a4850ac4</md5file>
-<md5file name="pdfatimesbi.php">2937220203e5a52762f5c9a4527e1988</md5file>
-<md5file name="courierb.php">baadbf936466cfc106ae73e5f15dba89</md5file>
-<md5file name="freesans.php">4fd59032d7c3a59fd45028bafa245721</md5file>
-<md5file name="zapfdingbats.php">191b3c2e856e750c06c0ba7987f902fb</md5file>
-<md5file name="stsongstdlight.php">eb85dc872664c0769e9fab1b7540b4d5</md5file>
-<md5file name="cid0kr.php">17dfe118f580bc2a08e21e8104ef68eb</md5file>
-<md5file name="timesb.php">ad485022027867116de0bf6c25b1854a</md5file>
-<md5file name="pdfacourierb.php">5aeb1084e3a6ae5ef7ecc2bfc7a15592</md5file>
-<md5file name="pdfacourieri.php">8702f5d6fbad08bf74378506ef376f83</md5file>
-<md5file name="freemonob.php">7596c070ac1bc839022e0a7aba2156ef</md5file>
-<md5file name="dejavuserifcondensedb.php">bcc98729a04598aecb86c451b91433ea</md5file>
-<md5file name="dejavuserifi.php">368af9ad30db4935e51b2109b9d4e9ca</md5file>
-<md5file name="helveticai.php">e0a7f23376f50de631db93814aff2e35</md5file>
-<md5file name="uni2cid_ak12.php">7ad3c70ef87d3657f918d3ee3649f31f</md5file>
-<md5file name="dejavuserifcondensedi.php">52b7639c5c4e35f33bb3c69cbfa0588d</md5file>
-<md5file name="dejavusansmonoi.php">a2a228f499608ddddeb2ba54834a5b7f</md5file>
-<md5file name="msungstdlight.php">c940b153fb6c5b3498efa181881b5b6c</md5file>
-<md5file name="cid0jp.php">f9f9da534cce6a9124cc6b919329944b</md5file>
-<md5file name="pdfatimes.php">287cb7bb6e6966708534cb9ed48d48ac</md5file>
-<md5file name="dejavuserifcondensed.php">4775a411c20fe8fb13e9fb3a46629dc3</md5file>
-<md5file name="freesansbi.php">9b2ce8f93949146d63dfef4d4784ad4c</md5file>
-<md5file name="dejavuserifb.php">18638db567f8b6fd7b1c6641ebf2c958</md5file>
-<md5file name="freeserifi.php">463334491415afc3e56661e87196b4f8</md5file>
-<md5file name="dejavusansi.php">016527b52b6af2d6784fffeb23a2349b</md5file>
-<md5file name="helvetica.php">2a315fa2593161154c319788f0ef2127</md5file>
-<md5file name="dejavusans.php">8b75ae7921f26b4f4b11d18ed921248e</md5file>
-<md5file name="dejavusansbi.php">7db990cc030127f1b64a4d3492f8f3e2</md5file>
-<md5file name="courieri.php">afdcd64e0d7d78942401354d7f5f180d</md5file>
-<md5file name="hysmyeongjostdmedium.php">51f6fe162641de3714866950d5eff4e8</md5file>
-<md5file name="freeserifbi.php">0a9d5e42c711a284436fa6f267e8ab85</md5file>
-<md5file name="kozgopromedium.php">2c5e8a67d1a805aae9842bbad59a873f</md5file>
-<md5file name="helveticabi.php">c22fdc8941f2956e0930b20105870468</md5file>
-<md5file name="pdfacourierbi.php">1f2386bedbebd633223278c1fd25109a</md5file>
-<md5file name="pdfatimesi.php">e0d060c7f70126e74c443b72ae560791</md5file>
-<md5file name="symbol.php">20e28c8b386ddbb38ead777f717d7c44</md5file>
-<md5file name="uni2cid_ac15.php">96c6b586a6afb6d72dc8b93b30f844d5</md5file>
-<md5file name="pdfahelveticabi.php">351ce642d2008500c8780cce574acdb2</md5file>
-<md5file name="dejavusansmonob.php">fc1cb0e9030ce6b891319ce46dd8c434</md5file>
-<md5file name="dejavusansb.php">95bf00532c504c237041c4e3f04936a1</md5file>
-<md5file name="freeserifb.php">bdf5ae55ea4d553beb785266dd0f9ffa</md5file>
-<md5file name="courier.php">2894170c52a47ac02bf094bf047f1984</md5file>
-<md5file name="pdfahelveticai.php">fa8aa7a5c2077676637614809bc0ea0c</md5file>
-<md5file name="pdfahelvetica.php">b8f1f393d7a247fdfe7668acf776e9d2</md5file>
-<md5file name="pdfacourier.php">35b71c6a8e678cdaa9d484ebab42c2ca</md5file>
-<md5file name="pdfatimesb.php">8f55434707b160cf1a8331d27e37e7e4</md5file>
-<md5file name="freesansi.php">4711cc4662b9136a881497c27b596135</md5file>
-<md5file name="dejavuserifcondensedbi.php">950310a6c12362b084a68b0cfa7f3373</md5file>
-<md5file name="dejavusanscondensed.php">6ac17b4d7485fe73dd2d754ce2a0e2d9</md5file>
-<md5file name="freemonoi.php">96fe7b1e5cd48c7332cf17b789f7af66</md5file>
-<md5file name="freeserif.php">02aac38356af65808e08e21f1ddd225d</md5file>
-<md5file name="dejavuserifbi.php">bccc18d3b8c2b941ef7ef6602aab6c69</md5file>
-<md5file name="dejavusanscondensedbi.php">de96058dc4fedbe4ccca03f9966ff743</md5file>
-<md5file name="helveticab.php">3daad3713df02c15beebd09ceecacacd</md5file>
-<md5file name="cid0ct.php">b8b582e30d3f3bd8867221dcc3dbf365</md5file>
-<md5file name="dejavusansmonobi.php">75c68bb955477a99fc98600f5e1f40a3</md5file>
-<md5file name="freesansb.php">bf1c8fcdd3706774086cd133a6e04d45</md5file>
-<md5file name="dejavuserif.php">eee692f442eaec2b8291419a2017e50b</md5file>
-<md5file name="courierbi.php">f9389202889738a0935be0d96f3aa609</md5file>
-<md5file name="cid0cs.php">9b187fb3a908fb75b7b2a8573a4d13c4</md5file>
-<md5file name="uni2cid_aj16.php">c458a95a74915bb3e01102060bf3d27c</md5file>
-<md5file name="kozminproregular.php">78fdf805f1cea6cd01912192821ec734</md5file>
-<md5file name="pdfazapfdingbats.php">34b9ef2cadf050ad58f391a7990c6975</md5file>
-<md5file name="aefurat.php">c0f60dd955a2bd3e6bace66eb362c9a5</md5file>
-<md5file name="timesbi.php">a5f3fbbef1831fe0bcd060edb6e5010b</md5file>
-<md5file name="aealarabiya.php">c49883919b7912057b1ffad674a9c7c2</md5file>
-<md5file name="freemonobi.php">99d8349acae8fcd95094364adf24dae2</md5file>
-<md5file name="dejavusanscondensedb.php">72b2fd6a41260897ef758436603d33a2</md5file>
-</dir>
-<dir name="/includes/tcpdf/include" >
-<md5file name="tcpdf_colors.php">cacdbe68a428ae36151a3d1152b2b77b</md5file>
-<md5file name="tcpdf_static.php">86c5b7ba9581a58bf6e465aea7d52e46</md5file>
-<md5file name="tcpdf_images.php">3c4338d70de8c99a86b3ee15924172a1</md5file>
-<md5file name="tcpdf_filters.php">fb794db6e06fa3cf7479fc889894caf3</md5file>
-</dir>
-<dir name="/includes/tcpdf/include/barcodes" >
-<md5file name="pdf417.php">3abe66ba8da6b6bf9cf1c6b0e907d51d</md5file>
-<md5file name="datamatrix.php">9a29da1e201fb23de4f499adbb9f6a71</md5file>
-<md5file name="qrcode.php">edd56d70cac390ef63feeef7e9d71b3f</md5file>
-</dir>
-<dir name="/includes/tcpdf/include" >
-<md5file name="tcpdf_fonts.php">5f4ae32bd59400b8f788ac644b693ed2</md5file>
-<md5file name="tcpdf_font_data.php">8f83bbc144d70505672f82679546c72d</md5file>
-</dir>
-<dir name="/includes/tcpdf" >
-<md5file name="tcpdf_parser.php">809d819fe86dc60509c0b39997fc0d4f</md5file>
-<md5file name="tcpdf_barcodes_2d.php">17bfd10e3232de9145f5b74a6ef6afac</md5file>
-<md5file name="tcpdf.php">67b77209f88a051d1a7dd39e6584212b</md5file>
-</dir>
-<dir name="/includes/phpexcel" >
-<md5file name="PHPExcel.php">b162a10416c2cba0be1ba5d979e19145</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="Chart.php">f8228e3250f191a1f69dfca422396b3b</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Worksheet" >
-<md5file name="AutoFilter.php">372d1bc3cc32141d16e6828bfcb7f15c</md5file>
-<md5file name="ColumnDimension.php">a234de35961af948a38652010a26c9d5</md5file>
-<md5file name="Drawing.php">8a4d8793abe8403cc6f5ab4af734250d</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Worksheet/Drawing" >
-<md5file name="Shadow.php">26c15cb43424cb0a5f4374b2f23205ba</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Worksheet" >
-<md5file name="CellIterator.php">f1d09aba4db36c2f1016eb065fcda1d3</md5file>
-<md5file name="PageMargins.php">1c6f773292c37fbd5665c68439399aa4</md5file>
-<md5file name="PageSetup.php">daa89e4bf8a6d7258ac1bcaa889c518f</md5file>
-<md5file name="Protection.php">2fb90091fdcd91c7033e2b9d43cd89b0</md5file>
-<md5file name="RowDimension.php">eb2c70a5c76c563e7e350275c8ea8b31</md5file>
-<md5file name="RowIterator.php">a6af0861d20de8d67561f9c09aee738e</md5file>
-<md5file name="SheetView.php">3f13f4441c56f049f641638ed8523035</md5file>
-<md5file name="BaseDrawing.php">b7f7a8a0717691a5fadb72ed9b953930</md5file>
-<md5file name="HeaderFooterDrawing.php">4d611ad3939347626d994450645914d6</md5file>
-<md5file name="MemoryDrawing.php">5e8879bea2ca8523121328fee835fb98</md5file>
-<md5file name="Row.php">2aab5b22f214a5fa75ff9d57f1dcf4fd</md5file>
-<md5file name="HeaderFooter.php">9687706ae4cad55d5caf9cf7a193968c</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Worksheet/AutoFilter/Column" >
-<md5file name="Rule.php">a3d8f09c515e695e7ea3d3ff6fecdc3e</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Worksheet/AutoFilter" >
-<md5file name="Column.php">9a095583d4968210c428aa671f7fd05c</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="WorksheetIterator.php">af897df7208934f59a4f5746db0f3e7c</md5file>
-<md5file name="Worksheet.php">6e58f3763d79400efb63ce5c692dfdb4</md5file>
-<md5file name="DocumentSecurity.php">e90fcba79e73f0813da74b92517043d8</md5file>
-<md5file name="IComparable.php">bb214b2b022f8a410aa7bce1e92724fd</md5file>
-<md5file name="RichText.php">dde30bfe8bfcbe0ee166386b64256dc5</md5file>
-<md5file name="Settings.php">ae2ab2799848a18dcceadd7514065059</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared" >
-<md5file name="Excel5.php">0f47c9d67789b573d2f22181f55c3636</md5file>
-<md5file name="ZipStreamWrapper.php">87b259cdf18e697f87a8d65092a7a049</md5file>
-<md5file name="TimeZone.php">5abc90c303abc0281a323c53d1e44c2b</md5file>
-<md5file name="Drawing.php">53a1ad86cb3f04d69b9dcb275a3db684</md5file>
-<md5file name="OLE.php">e9042b477814247c6860233246c57163</md5file>
-<md5file name="Date.php">d94304e12bf6cbd4f8f000c4fc563766</md5file>
-<md5file name="PasswordHasher.php">ff0d3b2b34e3e09b44827b46cef20d43</md5file>
-<md5file name="String.php">e6bf12ee8555d9fdc3d0f2c42940436b</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/PCLZip" >
-<md5file name="pclzip.lib.php">cdf35ff41736804343d6a5b1ac20c69f</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared" >
-<md5file name="XMLWriter.php">cfe68492dea5ba16eaa85ff232bafdb6</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/OLE" >
-<md5file name="PPS.php">7ecb0c1313a804acf7cca3bfc2af5371</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/OLE/PPS" >
-<md5file name="Root.php">58adbd597318114bf70164c0915d6836</md5file>
-<md5file name="File.php">7f90ecb330695a1f3d6e3b7212bfd804</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/OLE" >
-<md5file name="ChainedBlockStream.php">5f8489eed8d4b6b7b13da0bbda876dac</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared" >
-<md5file name="Font.php">4a1790fb8c8aacf08aa645cde5f07d0f</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/trend" >
-<md5file name="powerBestFitClass.php">d138cba0fea34603f4196dc5153d8e26</md5file>
-<md5file name="linearBestFitClass.php">96b453f1c7b3bf0485319a462084db96</md5file>
-<md5file name="polynomialBestFitClass.php">7615dbe480f829b7a967a0562c8e7221</md5file>
-<md5file name="exponentialBestFitClass.php">63003d078e0b8c6321f303661321bc33</md5file>
-<md5file name="trendClass.php">755728ff7720434f400c85c4d7e9c0b5</md5file>
-<md5file name="logarithmicBestFitClass.php">ab2a6b84195ac4739dd22f429a36c13b</md5file>
-<md5file name="bestFitClass.php">1b2e22f2a95597db45c8af5af3852506</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared" >
-<md5file name="ZipArchive.php">53f42b65c3712a2ca5f7afc148c110b7</md5file>
-<md5file name="File.php">ba3387a36f0bc8fd51e880c434d426b9</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher" >
-<md5file name="DgContainer.php">47144408dbbf4a7eba63f1761a499508</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer" >
-<md5file name="BSE.php">0cb495cc714a0583c0a45a65079cb2b7</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer/BstoreContainer/BSE" >
-<md5file name="Blip.php">a8408f6208da9f44b381e808b83c1bb9</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher/DggContainer" >
-<md5file name="BstoreContainer.php">c871f031ea048c72acf364943d927ca6</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher" >
-<md5file name="DggContainer.php">2d31c00eb7f8d4a4fd960971e4809d31</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer" >
-<md5file name="SpgrContainer.php">8c6212c872e88f2009fb441f68a1ae74</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/Escher/DgContainer/SpgrContainer" >
-<md5file name="SpContainer.php">edd95eb12e0cf72e391e897c595ee289</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared" >
-<md5file name="Escher.php">c532a9793127f95ef92106e37194499c</md5file>
-<md5file name="CodePage.php">08b7348a9439950035cc7511a0fcddf6</md5file>
-<md5file name="OLERead.php">bd8a3d70f7c061e94386466b0e52d9ef</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/JAMA" >
-<md5file name="CholeskyDecomposition.php">4cd066bfbbf816d406d4343970f029b4</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/JAMA/utils" >
-<md5file name="Error.php">eb649938f2a91662ca060d49414ce4cb</md5file>
-<md5file name="Maths.php">0497fc1a8fa4467c01aaaffc4eb7ae61</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Shared/JAMA" >
-<md5file name="QRDecomposition.php">b66080d9f6ee6863cdb2a90e90d0dff4</md5file>
-<md5file name="EigenvalueDecomposition.php">932bdce69cd84691658ee4ebde954d1b</md5file>
-<md5file name="LUDecomposition.php">0b7c9cb30c4f266489e94e39de7bc8eb</md5file>
-<md5file name="Matrix.php">7df53375d2ba071872f4f0d78eb08b50</md5file>
-<md5file name="SingularValueDecomposition.php">b0e3e59ac4a59d120775fd038d8bc693</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="Autoloader.php">829aef425771dbe207a07c8c056f41fe</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Cell" >
-<md5file name="IValueBinder.php">119ddf7becb7ec0533a2d1af9144f4f9</md5file>
-<md5file name="AdvancedValueBinder.php">dfb33b91b611417dd4aa229ebff9e7d9</md5file>
-<md5file name="DataValidation.php">3f1fc62470db30f980446bc250cc2b19</md5file>
-<md5file name="DefaultValueBinder.php">5ca78dbb9603e64cc7630f1e45aa7eeb</md5file>
-<md5file name="DataType.php">060e704e080033d19da3d279e0080913</md5file>
-<md5file name="Hyperlink.php">dce41ebd1e3eaddd92aa77cb18ae23c3</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="CachedObjectStorageFactory.php">7d4bf23a5c30fa32febd05464db47ca4</md5file>
-<md5file name="ReferenceHelper.php">fd45c67989eed6b7d3881ac7d660ef68</md5file>
-<md5file name="IOFactory.php">99d181ffb366ca1d65449ab8d7f73233</md5file>
-<md5file name="Calculation.php">bcbd68efc7bbe8f64d1dcea62b0ef39e</md5file>
-<md5file name="Cell.php">87c0ddff94acf4073911f561e66e9c56</md5file>
-<md5file name="DocumentProperties.php">7e1c640c2f39ba23ab72652ba6bb0825</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/CalcEngine" >
-<md5file name="Logger.php">7ea3145a0dfe1d9da222884bdc89a606</md5file>
-<md5file name="CyclicReferenceStack.php">b95ea04521788a9c3c5f311ba98db929</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="NamedRange.php">457ba7f711105eba233443a3f1c6fffe</md5file>
-<md5file name="Style.php">da67e2754b466b467f9b97d7dce1b367</md5file>
-<md5file name="Exception.php">3d57d24d680dec4818f4357f2cba6268</md5file>
-<md5file name="Comment.php">27701a1de23da787b0d3491b886f6966</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/CachedObjectStorage" >
-<md5file name="Wincache.php">bfcfd11916648c543cf40ff4f531f859</md5file>
-<md5file name="SQLite.php">c9c051d0e3d9d09c70e433bf63c56e68</md5file>
-<md5file name="DiscISAM.php">861a9e8b55723564a5fe508b357027d1</md5file>
-<md5file name="APC.php">1c41c7cb2d913823e65ea25b9b067a34</md5file>
-<md5file name="MemorySerialized.php">44ef4a89c95664c98d629e062e13537d</md5file>
-<md5file name="Memory.php">9534f18545bb75eab35be1909d01716e</md5file>
-<md5file name="PHPTemp.php">42779e7cbca0ce50a46c94d453f22101</md5file>
-<md5file name="ICache.php">1f2af9d27a32d3bfadb9af4df5bedbdc</md5file>
-<md5file name="CacheBase.php">8b6d02597c98dbe4998550104ae90e51</md5file>
-<md5file name="SQLite3.php">d661e302e5a904c9d5b2975feab00886</md5file>
-<md5file name="Memcache.php">5e2d553b5b5f009b217099ddff7f7143</md5file>
-<md5file name="Igbinary.php">95c4077ef635ca070d9b7e147b4a97f1</md5file>
-<md5file name="MemoryGZip.php">3022ef929652913067110629d8be51f0</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Calculation" >
-<md5file name="Engineering.php">dfe86760bf0f9899b0fcfc86c7172bdc</md5file>
-<md5file name="Function.php">33f4b1f8e4c449cbf4a01710b3de380e</md5file>
-<md5file name="ExceptionHandler.php">1cbd40249a14b7ef003c8a6f44e3022a</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Calculation/Token" >
-<md5file name="Stack.php">f0bf96a5e49457f8031630df2134222f</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Calculation" >
-<md5file name="DateTime.php">4456ef4ddfcadde7b479cacfe46c1f39</md5file>
-<md5file name="Functions.php">3fe76e0f0782364db62969a16a391373</md5file>
-<md5file name="MathTrig.php">4129d479726c923853f533863980b485</md5file>
-<md5file name="Financial.php">e1e9ddc20eafcd968f8c9f51a56736ea</md5file>
-<md5file name="FormulaToken.php">62b7de49a5677852bdc59e5c849173a0</md5file>
-<md5file name="TextData.php">dc02ad9bb7d7cbf9c8cee893284bc9d8</md5file>
-<md5file name="Database.php">ab2155979557b00ecef7c1b7c7e8958d</md5file>
-<md5file name="Statistical.php">e85ad470880e4acf2c2c76e288216b26</md5file>
-<md5file name="Exception.php">090f70ef38b639a7eb61c17dd6fc09a7</md5file>
-<md5file name="Logical.php">2bd3bf69b9320a995e80c7ce85af673a</md5file>
-<md5file name="FormulaParser.php">4d924d6b8d09a243f14a16202e3266bd</md5file>
-<md5file name="LookupRef.php">ecdfde02f33a63b14166a42680cf8cdb</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Chart" >
-<md5file name="DataSeriesValues.php">44acaa258dd743bd7e274205a2f36288</md5file>
-<md5file name="Title.php">ebddf398f5da69049cfe4167b5e6b880</md5file>
-<md5file name="Layout.php">70c0fc61adcb15addb3a06df5a810932</md5file>
-<md5file name="PlotArea.php">450e1e6dbddd31e411110de6f18a5b4b</md5file>
-<md5file name="DataSeries.php">0d16f75fa10e866a576667e4e0dfe825</md5file>
-<md5file name="Exception.php">0c1c0f5a4bf1ea99ac241c8604d70d3e</md5file>
-<md5file name="Legend.php">abe5aff33c491eff6b115bc16eb0badb</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Chart/Renderer" >
-<md5file name="jpgraph.php">cd76059e9319a93321c839e039fa2456</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/RichText" >
-<md5file name="Run.php">07c586be90bdcc5c8429c4285d1d357c</md5file>
-<md5file name="TextElement.php">dcbcccd74064350045ebca7ff9c61c4f</md5file>
-<md5file name="ITextElement.php">6094b341562284a4596ec75bcbd37deb</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Reader" >
-<md5file name="Excel5.php">18bcbf63cd346f9bf9ee4edd60e69a23</md5file>
-<md5file name="IReadFilter.php">e9c60631b682b4d70caba0c8abde2db7</md5file>
-<md5file name="OOCalc.php">8adf723e1ca06d2217f132ad66b3d112</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Reader/Excel2007" >
-<md5file name="Theme.php">7b177c892a85d8a3eee3a7b482d01e2e</md5file>
-<md5file name="Chart.php">7739e48ce21ce35cd78f1247b6eed711</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Reader/Excel5" >
-<md5file name="MD5.php">d68b958fab17ee3c8e933beeafdd9881</md5file>
-<md5file name="RC4.php">beb2be314774a6dc4412ac7eb5211306</md5file>
-<md5file name="Escher.php">1b7a1789b75594414fe2f0533422557b</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Reader" >
-<md5file name="Gnumeric.php">7f3af95b8429cb1135f1d0b6f38e89e4</md5file>
-<md5file name="HTML.php">c22e2d91ffd4f71ffe56f32989d1c3a1</md5file>
-<md5file name="IReader.php">601214922e3c23f448755f48fa6d7f7e</md5file>
-<md5file name="Excel2003XML.php">be8192ecd06e39c897bd970b436d6293</md5file>
-<md5file name="DefaultReadFilter.php">ae7d425c162f8fdcc31b6780c5f60aa4</md5file>
-<md5file name="Abstract.php">9f5036a9754b83c78ef667a5ba915f8a</md5file>
-<md5file name="Exception.php">f6aff5dbba38184dd8998c576b3093ad</md5file>
-<md5file name="Excel2007.php">e3ef3bf3556ae02dc94a2bdc360d2d49</md5file>
-<md5file name="SYLK.php">d5897a77179001eb8dbbb0aa1de54193</md5file>
-<md5file name="CSV.php">b833ba10c2a43fb30378db9d53fcd3c0</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel" >
-<md5file name="HashTable.php">1dd7b0e81060df90697a59af9e892e0e</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Style" >
-<md5file name="Color.php">713cc92bd897d941b740aef1bfbb64ee</md5file>
-<md5file name="Borders.php">16ee4b07a337b4e9e04a6cd919bb48c7</md5file>
-<md5file name="Border.php">2f0031ab554d1ae49ff97db3764b33c5</md5file>
-<md5file name="Supervisor.php">0f42b24f6a1b9eba72b885c94dfd2c4d</md5file>
-<md5file name="Font.php">b3bfc3ff51c1b630a842fd2a8c430fb0</md5file>
-<md5file name="Protection.php">485c9e075ba3a2a36de5bc546f7e07e9</md5file>
-<md5file name="Conditional.php">7abe01720f55b034034b834b89ec1306</md5file>
-<md5file name="Alignment.php">2b69d68dd6f5a829982f6d563ef62442</md5file>
-<md5file name="Fill.php">d01f94a52840ed0da0fe14c3e70d3592</md5file>
-<md5file name="NumberFormat.php">7d4348022e6489408cec85c94210ff99</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Writer" >
-<md5file name="Excel5.php">e3ec127b7e8b2bd7e8e1766d1a36db7b</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Writer/Excel2007" >
-<md5file name="Theme.php">5a4b646decff7132463240f4f57b3592</md5file>
-<md5file name="DocProps.php">e78a29ba0df7c9bef147defe5ed5c296</md5file>
-<md5file name="Chart.php">d4e5e96dcf25b31361aa0ef68ea9dad2</md5file>
-<md5file name="Worksheet.php">7a8bab6fc66b5d2ce4f152bcabb0acbc</md5file>
-<md5file name="Drawing.php">6148d30ad1a4bdd7d0937358d6b461e7</md5file>
-<md5file name="RelsRibbon.php">9ca66b984093a947484d8b50abaa4329</md5file>
-<md5file name="RelsVBA.php">1db9cc9d11e448fe8b6668158c187728</md5file>
-<md5file name="Style.php">c2bfcd0f8843aa94180737e3c6824593</md5file>
-<md5file name="Comments.php">a51ecda844cf3dd21ab391e71d8f9af0</md5file>
-<md5file name="StringTable.php">91784f44ac5d4a6ca2290e44242c4d3b</md5file>
-<md5file name="Rels.php">c38cfaedd5384ac4c0ba3765581d9475</md5file>
-<md5file name="Workbook.php">c20ba6ecad9f9c1d2a041c9aa59410f2</md5file>
-<md5file name="ContentTypes.php">d36e0b9cb8cda905d16adb7f4ac97832</md5file>
-<md5file name="WriterPart.php">ed2e03a937832c0f36ef4ab568db8105</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Writer/PDF" >
-<md5file name="DomPDF.php">653edba822938ce0b1589595b26ab274</md5file>
-<md5file name="Core.php">3c0b5fd7b2a333bce8026e36d3b551ac</md5file>
-<md5file name="tcPDF.php">d714db26f9bbae92fcfe6189feb04af3</md5file>
-<md5file name="mPDF.php">2868b5c28a90d590cbf4413c8aead039</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Writer/Excel5" >
-<md5file name="Parser.php">bbeb679422f9fd8474d9c635d6a81806</md5file>
-<md5file name="Worksheet.php">3ddfb7689e5681029ebe9d8308fbe2c6</md5file>
-<md5file name="Font.php">8cd1881440ae64839a38ff9838ea6aff</md5file>
-<md5file name="BIFFwriter.php">ff8cffaec052817493a619c4b5de14bb</md5file>
-<md5file name="Escher.php">435a535b406ba64c00f9d6eca9455f30</md5file>
-<md5file name="Workbook.php">aca6d8c08e6c663bea2a2e89811a7c58</md5file>
-<md5file name="Xf.php">c5b833c89e8077c9a61ff61d82cda36b</md5file>
-</dir>
-<dir name="/includes/phpexcel/PHPExcel/Writer" >
-<md5file name="PDF.php">c1be273bd3bcaa02fde483945228edef</md5file>
-<md5file name="IWriter.php">16915cb7d9769afd557cf5ec03de59a4</md5file>
-<md5file name="HTML.php">c125f0136ce8d49614938238294fe6b0</md5file>
-<md5file name="Abstract.php">58faad0c53a97548125937e2ac0079e7</md5file>
-<md5file name="Exception.php">38b17de188c75ee96abcedfbad061a58</md5file>
-<md5file name="Excel2007.php">a52e6402293e6704ece85c2abbbc244b</md5file>
-<md5file name="CSV.php">8b202634562ae4c51e87598498acfb9d</md5file>
-</dir>
-<dir name="/includes/nusoap/lib" >
-<md5file name="class.soap_parser.php">cd0df1eb1ee58f4a1ac754bfdefe1cd2</md5file>
-<md5file name="class.nusoap_base.php">2bb0873c4f7f81c0c99b54d2942628b8</md5file>
-<md5file name="class.soap_server.php">e096c55a1206299868b4a383032c8534</md5file>
-<md5file name="nusoapmime.php">1b477bc500a440a840ffaaafb17f2c7f</md5file>
-<md5file name="class.soap_transport_http.php">b6adc5d873fbe888679d379f9a8bfc6b</md5file>
-<md5file name="class.wsdl.php">b2154fd07961f3c80f34d9513c06a3a0</md5file>
-<md5file name="class.soapclient.php">535fdffb3136f26c9abfe69ea0f046e6</md5file>
-</dir>
-<dir name="/includes/nusoap/lib/Mail" >
-<md5file name="mimePart.php">e21e73dbcacbf40381e034073f1c0a2f</md5file>
-<md5file name="mime.php">741f7a57eb9d8d525d0d8b8f701de3ab</md5file>
-</dir>
-<dir name="/includes/nusoap/lib" >
-<md5file name="class.wsdlcache.php">aae48f5a99308c12641af94e8fdeb31d</md5file>
-<md5file name="nusoap.php">b9ebe1856ffe897a519c981e673f5339</md5file>
-<md5file name="class.soap_val.php">7922785cf9644cdc09b48f85f4851781</md5file>
-<md5file name="class.xmlschema.php">dfea3cd5ec8c64bedb9aa2594b3a2d19</md5file>
-<md5file name="class.soap_fault.php">2ed12a38674b56a0928c25b881882435</md5file>
-</dir>
-<dir name="/includes/odtphp/zip" >
-<md5file name="ZipInterface.php">e90ac5d6893f33fb504a632e6881ab80</md5file>
-<md5file name="PhpZipProxy.php">0a9ff928fac90b7d31a211798c5d7b07</md5file>
-<md5file name="PclZipProxy.php">24faffc6ec8a98224a7458268780df30</md5file>
-</dir>
-<dir name="/includes/odtphp/zip/pclzip" >
-<md5file name="pclzip.lib.php">be4ad6fa5c6f10b2267c2f5c37a96995</md5file>
-</dir>
-<dir name="/includes/odtphp" >
-<md5file name="Segment.php">898baf66f1dd853750e80807b751781d</md5file>
-<md5file name="SegmentIterator.php">aa549e38162bbebca92c3568439e6cca</md5file>
-<md5file name="odf.php">9445a3c5996ff19deeb342cb676fe76e</md5file>
-</dir>
-<dir name="/includes/evalmath" >
-<md5file name="evalmath.class.php">cf0c603a372ec04408f4f0390e508ada</md5file>
-</dir>
-<dir name="/includes/restler/vendor/composer" >
-<md5file name="autoload_namespaces.php">156ab53018330fbaadc8d2193122161a</md5file>
-<md5file name="autoload_classmap.php">8645d3a4e3ad87e7cf4d88a46717aab4</md5file>
-<md5file name="ClassLoader.php">34d839144753232357cd717d22a9aa90</md5file>
-<md5file name="autoload_real.php">c85ebe8f83d320c0e9f9d4ee0025b2e3</md5file>
-<md5file name="installed.json">58e0494c51d30eb3494f7c9198986bb9</md5file>
-<md5file name="autoload_psr4.php">dd3a00f0d13eb29781edd8c77d4c5100</md5file>
-</dir>
-<dir name="/includes/restler/vendor" >
-<md5file name="autoload.php">faa3d57f656bb89f0914273d9dba89cf</md5file>
-</dir>
-<dir name="/includes/restler" >
-<md5file name="Defaults.php">a8e788eb2a22ce4274364320651076cb</md5file>
-<md5file name="CommentParser.php">d88b57d0901f72d603015935b08bffbd</md5file>
-<md5file name="iCache.php">c39c0ec9bfdabd9160898bb2207cf54b</md5file>
-<md5file name="HumanReadableCache.php">503b7ebe0800eb7a3afcd0dda6b9838d</md5file>
-<md5file name="iUseAuthentication.php">10070b750beb7fdb3eec3b6d071326c8</md5file>
-<md5file name="composer.json">ee84444dcf34101555d20a813d528c44</md5file>
-<md5file name="Redirect.php">27ca66fec321e776b30781476830ac85</md5file>
-<md5file name="iCompose.php">c109626d2c1a29e2b6cd42313711fdaa</md5file>
-</dir>
-<dir name="/includes/restler/Format" >
-<md5file name="XmlFormat.php">ab1dfe792ea9436359f651f3a1f65d02</md5file>
-<md5file name="JsonFormat.php">f10d74f8335a189a409782443b09805b</md5file>
-<md5file name="TsvFormat.php">eab26c488eb7c1fa4100c09214424bd0</md5file>
-<md5file name="UrlEncodedFormat.php">4f95b99420773f3d8e4ced0c3bc9223a</md5file>
-<md5file name="Format.php">dff24ec9037e89eddf76bb88bdab67a3</md5file>
-<md5file name="JsFormat.php">e13584f9ff137d75e7b7c95246502736</md5file>
-<md5file name="MultiFormat.php">15a8c2a80d40107a85c287753f568cfb</md5file>
-<md5file name="iDecodeStream.php">65c9b4293efb115c78d5b6f988d9b383</md5file>
-<md5file name="PlistFormat.php">4349cfe7ef92aac387c6a708955d3772</md5file>
-<md5file name="AmfFormat.php">15356f5c34f9c8ee074f93d48af8a1ed</md5file>
-<md5file name="CsvFormat.php">30c2b3d88b2e27d96044bb0aa6cc9568</md5file>
-<md5file name="HtmlFormat.php">050995365487e38a4f257403af91492e</md5file>
-<md5file name="iFormat.php">ffa56a318b5cd809e07a5caa0c4ad2ef</md5file>
-<md5file name="YamlFormat.php">be3dfcaef18d9fc6dc90d7b9bf0ac3bf</md5file>
-<md5file name="UploadFormat.php">c0c1addee9fca4220aa6f7af5b184070</md5file>
-</dir>
-<dir name="/includes/restler/Filter" >
-<md5file name="RateLimit.php">645f26ac093c9f9f1bc6b0861a329b18</md5file>
-</dir>
-<dir name="/includes/restler/UI" >
-<md5file name="Forms.php">7790d0f4472a9ed77e34741935da7ce9</md5file>
-<md5file name="Tags.php">c0b20e7b6ef415d88bed1e3f9cda474c</md5file>
-<md5file name="Emmet.php">48b7f6d2571d20c5109354ce787cd510</md5file>
-<md5file name="Nav.php">fa81a8726479f796f1269dcc9ed45e20</md5file>
-<md5file name="FormStyles.php">b2ba1282e6fa0e3933765314b7b580be</md5file>
-</dir>
-<dir name="/includes/restler/compatibility" >
-<md5file name="restler1.php">e9fd5f9dd13021be3f8772085dd1450f</md5file>
-<md5file name="restler2.php">963d1cdf7bf054f4d11cc7beee9c4fab</md5file>
-<md5file name="iAuthenticate.php">789fdd564b2371cbfb26bdc75a58a4b1</md5file>
-</dir>
-<dir name="/includes/restler" >
-<md5file name="ApcCache.php">f178d8cd46d8a5c8c08168b6c3e77284</md5file>
-<md5file name="iProvideMultiVersionApi.php">e60ef16f16b72b7bd2c3c4fef7a10e50</md5file>
-<md5file name="Util.php">733effd0686756cb4269ca01bc036ac2</md5file>
-<md5file name="Compose.php">413b33ab0efd7c3f58e4e3071a26afd0</md5file>
-</dir>
-<dir name="/includes/restler/Data" >
-<md5file name="iValueObject.php">b6cf2813cc4a33d8ce2bdfdc485abdb2</md5file>
-<md5file name="String.php">1eef4e317fa968abd5ea78583d81674d</md5file>
-<md5file name="ApiMethodInfo.php">29a69a37d953e9290c5c8107a60ba9f1</md5file>
-<md5file name="Invalid.php">fcce71ee4a305553c8236423aed6e467</md5file>
-<md5file name="Validator.php">b6e195c1706b6c1ad3fc15b2ba99e189</md5file>
-<md5file name="iValidate.php">5bb875a3780ea0063e957c37adf5bbfb</md5file>
-<md5file name="ValidationInfo.php">48b63641854e63d0ad75f4612639d2dc</md5file>
-<md5file name="Object.php">0c6fd0668e675c38ab3bf222a1e38ef2</md5file>
-<md5file name="Arr.php">3697a1f0a25f2e279c1d17d180a032a1</md5file>
-<md5file name="ValueObject.php">839fe2c3c3856d3a2d4e1f4e055e1aa4</md5file>
-</dir>
-<dir name="/includes/restler" >
-<md5file name="Scope.php">2fc19929f55ae8fafb9d90194909a7fd</md5file>
-</dir>
-<dir name="/includes/restler/views" >
-<md5file name="debug.php">5ceace7f9328f5d03a8114d0b01054ba</md5file>
-<md5file name="debug.css">549bde73d914532fadf3518767082c37</md5file>
-</dir>
-<dir name="/includes/restler" >
-<md5file name="iFilter.php">cb427d7bd272224639953750744e42cc</md5file>
-<md5file name="Flash.php">b2d971a2866db6a715940ef0e921ae72</md5file>
-<md5file name="Resources.php">6a250628e0160f32eab48ff5d952bb15</md5file>
-<md5file name="iIdentifyUser.php">8f2e2fdff63d8c9fcfbc93f237056570</md5file>
-<md5file name="iAuthenticate.php">d00cfae4373f5f9b38452a2f1ac84e7f</md5file>
-<md5file name="EventDispatcher.php">26b4e2d38073beed408323978b68c6f7</md5file>
-<md5file name="Routes.php">dff479103b3608b977b61de447b7d5cd</md5file>
-<md5file name="Restler.php">c18eecb24170824d9de7dea4b539d62a</md5file>
-<md5file name="RestException.php">0e0e21aad42de8783072f98440ecdd9b</md5file>
-<md5file name="User.php">7e0ea571abb78ba5fadc435819e30bd5</md5file>
-<md5file name="AutoLoader.php">33080834ad6e4f9ed3ec21dff3666e74</md5file>
-</dir>
-<dir name="/includes/jsgantt" >
-<md5file name="jsgantt.css">c3ccf7492299ddea74c15ff331ea0f9a</md5file>
-<md5file name="jsgantt_exExternalXML.html">d7c38727c22bb427515f94092c323d51</md5file>
-<md5file name="jsgantt.js">5b2c3dbd4abbc7eff715977d4442c50f</md5file>
-<md5file name="jsgantt_Minutes.html">fa2bddaa89b6129d309a100838daaf79</md5file>
-<md5file name="jsgantt.min.js">c7fcdbfdc4bde8825a57450051950df8</md5file>
-</dir>
-<dir name="/includes/printipp" >
-<md5file name="BasicIPP.php">c64f69772eade6cdfc2db95241ecf833</md5file>
-<md5file name="PrintIPP.php">e8592f94912d5ca0c519d036efa796e5</md5file>
-<md5file name="ExtendedPrintIPP.php">e1b7320c28b4494fba3338801618f1f9</md5file>
-<md5file name="http_class.php">93d0209adac1b1a2b4e3cf2173cf995a</md5file>
-<md5file name="CupsPrintIPP.php">20e95e9c16378e6ac4df49011220f904</md5file>
-</dir>
-<dir name="/includes/tcpdi" >
-<md5file name="tcpdi_parser.php">778ee87bf2f490b2737b2575d6a8367d</md5file>
-<md5file name="fpdf_tpl.php">36e0aff3d3354e60d6470d44c07d1760</md5file>
-<md5file name="tcpdi.php">c6f393b8430b95f521554b427d675a68</md5file>
-</dir>
-<dir name="/includes/jstz" >
-<md5file name="jstz.min.js">cf77c217a823810ab91c5430a021a5f5</md5file>
-</dir>
-<dir name="/includes/mobiledetect" >
-<md5file name="mobiledetect.class.php">7767bbed33494eb25fcaabba00e68b7a</md5file>
-</dir>
-<dir name="/includes/fpdfi" >
-<md5file name="pdf_parser.php">d2a5b87e5832c708a67b8718e6cb89bd</md5file>
-<md5file name="fpdi.php">6bff9cf68d35e1f83c670731e270c91c</md5file>
-<md5file name="fpdi_pdf_parser.php">f6b62af680035531c943bb9fe3f416a1</md5file>
-<md5file name="fpdf_tpl.php">725a7d1d35aaa7deb29d8d7b68d5a7f9</md5file>
-<md5file name="fpdi_bridge.php">06e8c0cd2ad1628f6e10a7430ee66bf5</md5file>
-</dir>
-<dir name="/includes/fpdfi/filters" >
-<md5file name="FilterLZW.php">1f0d1c2f75d69114936f822e4cccf02d</md5file>
-<md5file name="FilterASCII85_FPDI.php">ce549b85795e2bf7f57d622f3fe5e306</md5file>
-<md5file name="FilterASCII85.php">8230b1f4124e9fd5a70a1aa71b9ba705</md5file>
-<md5file name="FilterASCIIHexDecode.php">de2f26a9b5b2409aa79d946fd383ad54</md5file>
-<md5file name="FilterLZW_FPDI.php">0569611956dba3b652addc02da4b6666</md5file>
-</dir>
-<dir name="/includes/fpdfi" >
-<md5file name="pdf_context.php">a1f9523bf430bdd2af7fb73de6b9e442</md5file>
-</dir>
-<dir name="/includes/geoip" >
-<md5file name="sample.php">497e603380ed4878a23cb93a6d41fc5a</md5file>
-<md5file name="geoipregionvars.php">c36eac40f8db61edea7958d8ac870f88</md5file>
-<md5file name="sample_city.php">d5eb6af8926a058a1509863d6fde211f</md5file>
-<md5file name="sample_org.php">0cef2d554ceb31f339c496ed5f06e63f</md5file>
-<md5file name="sample_region.php">a6af9e25307918427d5fc1a92c2d73a4</md5file>
-<md5file name="sample_distributed.php">c2c7554e684b3215f323bee3acaa467a</md5file>
-<md5file name="sample_netspeed.php">496f2de8d1731c247561cea5b9356f5d</md5file>
-</dir>
-<dir name="" >
-<md5file name="document.php">29edd079877a1f97269ec792704ba1be</md5file>
-</dir>
-<dir name="/don" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/don/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="donation_extrafields.php">9d9ed081b02473d59ae3136c609a4cbb</md5file>
-<md5file name="donation.php">32294c7b8e0d8d92ea4602dbc711aabb</md5file>
-</dir>
-<dir name="/don/stats" >
-<md5file name="index.php">45b8f2a739f31491b77359b58d5404a1</md5file>
-</dir>
-<dir name="/don" >
-<md5file name="document.php">ba73eb37155d87d598b58b80b3e80030</md5file>
-<md5file name="card.php">3e053329347eacc11557b6830a363435</md5file>
-</dir>
-<dir name="/don/payment" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">af944efb9b60c1720dfe81f4f4f7238e</md5file>
-<md5file name="payment.php">0f1f51d292ca3ef7c7e527b46da108ad</md5file>
-</dir>
-<dir name="/don/class" >
-<md5file name="don.class.php">d95016aca11454630c3dc827148a0a7a</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="donstats.class.php">a56cf6032b216e3bfac42b3cc7f5ee55</md5file>
-<md5file name="paymentdonation.class.php">2f723ff5a2aac188d21443ea6beb93eb</md5file>
-</dir>
-<dir name="/don" >
-<md5file name="index.php">ca5bcba1121f68e181f5bae2e83d7ddf</md5file>
-<md5file name="info.php">e374ca08550cfacf79a0b94ddc7c0a2c</md5file>
-<md5file name="list.php">9aa5be174f06d77b2dc55b1cd034adbe</md5file>
-</dir>
-<dir name="/ftp/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="ftpclient.php">39a29fe8ff9f5087781dce05914a01dd</md5file>
-</dir>
-<dir name="/ftp" >
-<md5file name="index.php">e91116632c7e0a745447beb5dacc9a7d</md5file>
-</dir>
-<dir name="/public/opensurvey" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="studs.php">5b098cb2854aff7179682728ebb9cd66</md5file>
-</dir>
-<dir name="/public/test" >
-<md5file name="test_forms.php">1245667ac7ce0e2b7d37c061a34a9b56</md5file>
-<md5file name="test_arrays.php">67264545b5329a8ba76bba329ae5bace</md5file>
-</dir>
-<dir name="/public/emailing" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mailing-read.php">a90f7b32ab9202da3ea6974de66a8a5b</md5file>
-<md5file name="mailing-unsubscribe.php">07598bf22d3860e20e172df4267d052f</md5file>
-</dir>
-<dir name="/public" >
-<md5file name="offline.php">fc8213a4a5a98ee458ddacc6bdd363c4</md5file>
-</dir>
-<dir name="/public/paypal" >
-<md5file name="paymentok.php">c2187f1d78aecd78bf874e49a926eeb1</md5file>
-<md5file name="newpayment.php">1c8f0e528720a9c9ded24e76518c9341</md5file>
-<md5file name="index.php">6d6695e08c63ce635ca3e2f6a1d6f402</md5file>
-<md5file name="paymentko.php">1272ec0d12432850c50005d9c1bb9d92</md5file>
-</dir>
-<dir name="/public" >
-<md5file name="error-404.php">69caa949b7e0f3137c6ce7482f38e0f8</md5file>
-</dir>
-<dir name="/public/agenda" >
-<md5file name="agendaexport.php">60e55d40812bbd154f08dce43e689ae4</md5file>
-<md5file name="index.php">a0fa0788291ee95ccb306b8aded3fce3</md5file>
-</dir>
-<dir name="/public" >
-<md5file name="index.php">c857cbd23a138dfdef6dbcbb475ccca2</md5file>
-</dir>
-<dir name="/public/paybox" >
-<md5file name="paymentok.php">e3620f73f3a1650f7fdb53e6c44a1c07</md5file>
-<md5file name="newpayment.php">b6255a08ce51ab32895aa41e6230a3f7</md5file>
-<md5file name="index.php">7724aa95e287dd12bfcd6a4a9c0e0e72</md5file>
-<md5file name="paymentko.php">c2e932610f10f683fb0111a7b7722565</md5file>
-</dir>
-<dir name="/public/api" >
-<md5file name="index.php">cc6872bf5f498a24ad9b06fb66e5a642</md5file>
-</dir>
-<dir name="/public/api/explorer/css" >
-<md5file name="screen.css">a1055abf728d65cc42676ffca66379f1</md5file>
-</dir>
-<dir name="/public/api/explorer" >
-<md5file name="index.html">490904cfef730ff7d1f4c6fdf2427c91</md5file>
-<md5file name="swagger-ui.js">93b60211370f85ea2df9ee8602e27ac4</md5file>
-</dir>
-<dir name="/public/api/explorer/lib" >
-<md5file name="handlebars.runtime-1.0.0.beta.6.js">e697c15fe969eb5405e16bc49264fa01</md5file>
-<md5file name="jquery.slideto.min.js">0860d2328e5a333731cf95de440f4356</md5file>
-<md5file name="jquery-1.8.0.min.js">3a728460147fb9af7faf0e587b9fbf42</md5file>
-<md5file name="swagger.js">e80584be003f3f3d859e629c1e84f65f</md5file>
-<md5file name="jquery.ba-bbq.min.js">07c72646c76932834219ef6827451df3</md5file>
-<md5file name="jquery.wiggle.min.js">7438b3ef10b182042dfa722f99ef2574</md5file>
-<md5file name="underscore-min.js">0899f764c85bbcc13206e3dd8318e678</md5file>
-<md5file name="backbone-min.js">9f8b43fd1df78dca0827c73e29890865</md5file>
-<md5file name="handlebars-1.0.rc.1.js">69583ccb35ec8ad521dd0d9f6814b865</md5file>
-</dir>
-<dir name="/public/api/explorer/images" >
-<md5file name="throbber.gif">bfefe70e3951f1883a84e7bc4033fe97</md5file>
-<md5file name="pet_store_api.png">1dd69a040ebe4d74c45e4d3d141c34a9</md5file>
-</dir>
-<dir name="/public/api/explorer" >
-<md5file name="swagger-ui.min.js">5eff8ad781c655fbc29cc4506ff68eaf</md5file>
-</dir>
-<dir name="/public/demo" >
-<md5file name="dolibarr_screenshot8.png">3c7be843008e4f8c210d80e653934963</md5file>
-<md5file name="index.php">d5d8751d99da19c8cc0c364366e1d043</md5file>
-<md5file name="dolibarr_screenshot9.png">624da46dbfc287fa7894fe66761c3f22</md5file>
-<md5file name="dolibarr_screenshot2.png">0d215ccf216116ad98f20c48b914bf34</md5file>
-<md5file name="dolibarr_screenshot6.png">54ece365991ca0dbf3892b5fe1d2046c</md5file>
-</dir>
-<dir name="/public/members" >
-<md5file name="index.php">ac2861b424e2b7e30a532f37b33d6889</md5file>
-<md5file name="public_list.php">4b9acab98ecbda7e226a1f6848ddfc41</md5file>
-<md5file name="public_card.php">913604462a67f54fd2b2e439373687f1</md5file>
-<md5file name="new.php">cc81befc15da5b8f83fcde8548f3b443</md5file>
-</dir>
-<dir name="/public/theme/common" >
-<md5file name="user_anonymous.png">d727abe4a721179026bbf1092cec946c</md5file>
-<md5file name="nophoto.jpg">71a38f6508c64163437075c7d5b717d5</md5file>
-<md5file name="index.php">e3fd8d6c7556714a8c4017612e82d417</md5file>
-<md5file name="user_woman.png">5c4a4febde945dbcaeb1d486362c3188</md5file>
-<md5file name="user_man.png">1ca080a3db301d48d265f7284a06a886</md5file>
-</dir>
-<dir name="/public/theme" >
-<md5file name="index.php">26cbc57df4a6f7f45e7530dfd1b556da</md5file>
-</dir>
-<dir name="/public/cron" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cron_run_jobs.php">ed31672779c081565dc562a6fd1fb347</md5file>
-</dir>
-<dir name="/public/donations" >
-<md5file name="donateurs_code.php">8a505d7ed420ab3a93ed504fb1db0a7b</md5file>
-<md5file name="index.php">823e0c612e7de62db2d41adf37214bea</md5file>
-</dir>
-<dir name="/public" >
-<md5file name="error-401.php">56f08275c87353995ebdd5373f678de8</md5file>
-</dir>
-<dir name="/cashdesk" >
-<md5file name="facturation_dhtml.php">5060ce972cbfdc1505a4ef5ea650e2f0</md5file>
-</dir>
-<dir name="/cashdesk/css" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css">9dc0be5de3a337cca64ef3e9cc0a49aa</md5file>
-</dir>
-<dir name="/cashdesk/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="facturation1.tpl.php">a8daea57ce57ec26d9e69bae09a4de68</md5file>
-<md5file name="validation2.tpl.php">745adf0a86c9402ae8d08ad2f198d366</md5file>
-<md5file name="liste_articles.tpl.php">ea919d13e77370c2542e7c20defe5a46</md5file>
-<md5file name="ticket.tpl.php">1b331e41775794399092b13709a36a3b</md5file>
-<md5file name="validation1.tpl.php">16e32befe7245bb0f920aff7430fa64b</md5file>
-<md5file name="menu.tpl.php">4ea138773b73a5ae105dd1fc61a493ef</md5file>
-</dir>
-<dir name="/cashdesk/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cashdesk.php">4eff8315855e8176e9a279cc3cfdb49a</md5file>
-</dir>
-<dir name="/cashdesk" >
-<md5file name="validation_verif.php">e9369438fb098c129be060ac6e705a9f</md5file>
-<md5file name="affIndex.php">8fd4a88aed32234ba887c20fd976d507</md5file>
-</dir>
-<dir name="/cashdesk/class" >
-<md5file name="Auth.class.php">653834503958f258dacebb5f928149bb</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="Facturation.class.php">ed2e19f478a4fd1376089ec4b653f027</md5file>
-</dir>
-<dir name="/cashdesk" >
-<md5file name="affPied.php">e14ed0babce46edd7d84dc9aa271d058</md5file>
-<md5file name="facturation_verif.php">3c90c8031f1c099642b27d392fe480e9</md5file>
-</dir>
-<dir name="/cashdesk/include" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="keypad.php">92609e87c5826db05f43b6470047253d</md5file>
-<md5file name="environnement.php">51465ea4c96dcec00fe6f060b378ac02</md5file>
-</dir>
-<dir name="/cashdesk/javascript" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="dhtml.js">043214cfec88cbe08e22a93ca425eb13</md5file>
-<md5file name="keypad.js">7b22629626fc5f780cced1f6d817d57b</md5file>
-<md5file name="facturation1.js">7dc0092414e8a0160f715413907ef350</md5file>
-</dir>
-<dir name="/cashdesk" >
-<md5file name="index.php">a407ef881b83bf2bacc9edeea1511248</md5file>
-<md5file name="affContenu.php">d968592147e2da6690da8161b4c8478b</md5file>
-<md5file name="validation_ok.php">70cc57adde39239a54f1800b4d4ce40c</md5file>
-<md5file name="deconnexion.php">a6a80c02f188fa39b135ce4f07fe1a99</md5file>
-<md5file name="validation.php">2e8a39a9624e070465fd1ef2cfd0e34f</md5file>
-<md5file name="facturation.php">5e8c8b93e0e977b883243c3ff3d9a571</md5file>
-<md5file name="validation_ticket.php">7a30afe2b7f7e02b189e6fbc521c1cd9</md5file>
-<md5file name="index_verif.php">8b208d9d73aea61ac49a9b462aabc445</md5file>
-</dir>
-<dir name="/cashdesk/img" >
-<md5file name="gescom.png">22f4d2b640778fc1e28f2b846679b1bb</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="login.png">628381f4ef8ee6d35665e002ffa61bb0</md5file>
-<md5file name="basket_delete.png">2a2f8d993d977c68987f52998c625257</md5file>
-<md5file name="new.png">185e9b25e8090c806e1164d18c3ab7ff</md5file>
-<md5file name="bg_conteneur_gauche.png">609462d6bedb898fcd2efa9085432ccd</md5file>
-<md5file name="bg_conteneur_droite.png">4fc187f0910aaaa9980dbed3071f6294</md5file>
-<md5file name="bg_pied.png">625d53776232369101dad5f6318f40c7</md5file>
-<md5file name="decrypted.png">ccf52560d23a20c3c23a90d2e6449d8e</md5file>
-<md5file name="lock.png">b508411bb915ecf32b1a995644f67fd1</md5file>
-<md5file name="calendrier.png">39fc42939724eeed99fc0f9554e2a6d7</md5file>
-<md5file name="bg_entete.png">a320ce39b96e92f089f639ef14a6ac6d</md5file>
-</dir>
-<dir name="/barcode" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="printsheet.php">51675e7f629f2fb30d597002fb83c9dc</md5file>
-<md5file name="codeinit.php">ccbbf4d5e94f37abf3ba9e9b31b2ac8b</md5file>
-</dir>
-<dir name="/comm" >
-<md5file name="remise.php">4632631df68e25c141acb349d916c3a3</md5file>
-</dir>
-<dir name="/comm/action/rapport" >
-<md5file name="index.php">af876c926d49c59376d8b6d642ce9f66</md5file>
-</dir>
-<dir name="/comm/action" >
-<md5file name="peruser.php">4d9613e1a21fa012ac864d96f1a62112</md5file>
-<md5file name="document.php">858d2732221359ba9e0a9965353848c3</md5file>
-<md5file name="card.php">877f5ab5413561ff0dc4afaee336b4a0</md5file>
-<md5file name="listactions.php">d59f578b7eb5f374eda40295072f0fae</md5file>
-</dir>
-<dir name="/comm/action/class" >
-<md5file name="actioncomm.class.php">b928537bcc970549c357bb80ef5ad16f</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cactioncomm.class.php">5c09b3d75fcba736c3353468236e5338</md5file>
-<md5file name="ical.class.php">563dbdf25cbfd4e4b50649530f7e1151</md5file>
-</dir>
-<dir name="/comm/action" >
-<md5file name="index.php">261d1bb522fccdea41b2573ee4fbf277</md5file>
-<md5file name="info.php">0a81d81144952f49baecb31cfc610fee</md5file>
-</dir>
-<dir name="/comm/admin" >
-<md5file name="askpricesupplierdet_extrafields.php">a42420522213f98440180fd87573e01f</md5file>
-<md5file name="propaldet_extrafields.php">0add03f5b0e2eb1605d6d5212b07b3bc</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="askpricesupplier_extrafields.php">67ceb3a25f32b473778a9205a0fe6499</md5file>
-<md5file name="propal_extrafields.php">49bd0e15735812688cd294348054a60e</md5file>
-</dir>
-<dir name="/comm/mailing" >
-<md5file name="card.php">d7f205e587e6a41f82ef5e0961a27225</md5file>
-</dir>
-<dir name="/comm/mailing/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mailing.class.php">a17ce976bfc75278c92275913622ca36</md5file>
-</dir>
-<dir name="/comm/mailing" >
-<md5file name="cibles.php">d4bf21d9624e8fef1f9d20465d2e5503</md5file>
-<md5file name="index.php">62fc08bff6c9c08fc68bd5ddab35e443</md5file>
-<md5file name="info.php">24ec97e48bfe034f3ee795ae9ceb282f</md5file>
-<md5file name="list.php">f1039a951ab36cebafbbabd8a4117e73</md5file>
-</dir>
-<dir name="/comm" >
-<md5file name="card.php">b0ddf2ae9be37ebe13ac48a6881616a1</md5file>
-<md5file name="propal.php">e4a04d30006545f88d06bd507e542506</md5file>
-<md5file name="address.php">25b3ce6e2f12f227c4a1ac8db9fab357</md5file>
-</dir>
-<dir name="/comm/prospect" >
-<md5file name="recap-prospect.php">af321d136a1e674037ba2c163db3d2b2</md5file>
-<md5file name="index.php">0d79377d6dbbc92ac4ca0db3ede4c00f</md5file>
-<md5file name="list.php">05087939aa7580314356261375ceff17</md5file>
-</dir>
-<dir name="/comm" >
-<md5file name="contact.php">637c350b86faf4b9066532d41dc87fdb</md5file>
-<md5file name="recap-client.php">ffb22ad3767850ed93e7a462fc8616e6</md5file>
-<md5file name="index.php">be649c02d533439a6d320c9bb229bdee</md5file>
-<md5file name="multiprix.php">23a9fe711137f3cb4f06dd011d38c23b</md5file>
-</dir>
-<dir name="/comm/askpricesupplier/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">2732b9f4859028d719c2d93a671f49fb</md5file>
-</dir>
-<dir name="/comm/askpricesupplier" >
-<md5file name="document.php">9b2c6de73503cceb102e875a364f6626</md5file>
-<md5file name="card.php">71f0213600f7ced820366e2a29cd1830</md5file>
-<md5file name="note.php">65e54e9e6458c353a92eeaafdb0d0022</md5file>
-</dir>
-<dir name="/comm/askpricesupplier/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="askpricesupplier.class.php">18cebf1db58bdd4c52b6b36a9fab1e14</md5file>
-</dir>
-<dir name="/comm/askpricesupplier" >
-<md5file name="index.php">aaeb594d255628a742d183b0c4fff3c6</md5file>
-<md5file name="info.php">bebba22e7a5fdb20a52dfcf1b64772a1</md5file>
-<md5file name="list.php">76b0dbbea2bf64439e204970f68bc73b</md5file>
-</dir>
-<dir name="/comm/propal/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">7802aef2c68c39a5655aa095873eceb5</md5file>
-</dir>
-<dir name="/comm/propal/stats" >
-<md5file name="index.php">140ca9e6844d65982fe76efbf153403e</md5file>
-</dir>
-<dir name="/comm/propal" >
-<md5file name="document.php">60beb0705c4819ef3ff88e49f02e2628</md5file>
-<md5file name="note.php">a407906c9e3dc5a2d20b3403a953def1</md5file>
-</dir>
-<dir name="/comm/propal/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="propalestats.class.php">bc43add6b32c31d1b01ea56190143f5c</md5file>
-<md5file name="propal.class.php">09546c41a854e762844c9fa4f2000aa0</md5file>
-</dir>
-<dir name="/comm/propal" >
-<md5file name="contact.php">abefa8f7d035ae87eb5b45b0c43843be</md5file>
-<md5file name="index.php">6cb2085059ec2f740f5ca8a2aa3ef310</md5file>
-<md5file name="info.php">1228532a69cfc2e4ce917fbedb9321aa</md5file>
-<md5file name="list.php">4032fa0aca1db6fc5e020d25ed7fab41</md5file>
-<md5file name="apercu.php">e3670650548097d9a7aaeb346f3bd5ef</md5file>
-</dir>
-<dir name="/comm" >
-<md5file name="list.php">d0bf76a584562ca01bcc46670b39af32</md5file>
-<md5file name="remx.php">ad62122318a931843599ec66c81cdf02</md5file>
-</dir>
-<dir name="/categories" >
-<md5file name="edit.php">4ca6185ba6db6546cfeb895c29bbdd34</md5file>
-</dir>
-<dir name="/categories/admin" >
-<md5file name="categorie_extrafields.php">71d1ef869b5ab59897f399b0d15f6e5f</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="categorie.php">88fbba4cba739a16e7aa39f9c3ecbe0e</md5file>
-</dir>
-<dir name="/categories" >
-<md5file name="traduction.php">497c587c91e1b79625ba7ee4cb949a93</md5file>
-<md5file name="card.php">6eb4f4ef85a909022bb3e9b90e7d8ee2</md5file>
-</dir>
-<dir name="/categories/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="api_category.class.php">ee74a794201de6cf45f08cc56c789ad7</md5file>
-<md5file name="categorie.class.php">493e569e803559c55dd06ca35411e0b4</md5file>
-</dir>
-<dir name="/categories" >
-<md5file name="index.php">dd8891037d36d4a87969e74f93d88e49</md5file>
-<md5file name="categorie.php">655a1635fdf3202e7d7c074a029bf277</md5file>
-<md5file name="viewcat.php">b3fd9f9544438ef81401c880177d40fd</md5file>
-<md5file name="photos.php">5c0c423540accb30a32265a7e909078f</md5file>
-</dir>
-<dir name="/contact" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="document.php">86fe8e6f4ba1e0da06a5523b1747310e</md5file>
-<md5file name="card.php">ee9e658395eb5f6e4e4415ad4b952a1c</md5file>
-<md5file name="note.php">502547de717912a19aca06ddd223995c</md5file>
-<md5file name="ldap.php">08d09a43fb6c23ea07250e482e0116d2</md5file>
-<md5file name="vcard.php">311259a2b28384c64ff2443c7feb9d21</md5file>
-</dir>
-<dir name="/contact/class" >
-<md5file name="contact.class.php">c1a2f4393f1fdbcffc80b181fd828d0a</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/contact/canvas" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/contact/canvas/default" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/contact/canvas/default/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="contactcard_view.tpl.php">b795793e8742698587af059a275581b4</md5file>
-<md5file name="contactcard_create.tpl.php">47e8ba9252c70ef0d0bce623d680ac3c</md5file>
-<md5file name="contactcard_edit.tpl.php">83d57cbbde26de78fe831891f6f8dd7e</md5file>
-</dir>
-<dir name="/contact/canvas/default" >
-<md5file name="actions_contactcard_default.class.php">66c525f1c24e58832662ea2ba2a21cbf</md5file>
-</dir>
-<dir name="/contact/canvas" >
-<md5file name="actions_contactcard_common.class.php">66ad801403f54ab0067a1c525ed542e6</md5file>
-</dir>
-<dir name="/contact" >
-<md5file name="perso.php">94819f93fcff199704b6195a50c12d94</md5file>
-<md5file name="info.php">af3abc6cbf19c242b3fe25271737fbab</md5file>
-<md5file name="list.php">f2df5d4e95f1091339a4f76516c5d2d4</md5file>
-</dir>
-<dir name="/product/composition" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">0d6cb1619a053d70c78672a9aecc4d01</md5file>
-</dir>
-<dir name="/product/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="product.php">f1aaa2ddccc69adf4fc2c6e9aad9fe61</md5file>
-<md5file name="dynamic_prices.php">7f74cf4fc62967e4f18a2b2d5f49a3f5</md5file>
-<md5file name="product_extrafields.php">50bc7526a36a03c57dca47022c735425</md5file>
-<md5file name="product_tools.php">d5093b1fa8a05ed2885905be1351aa57</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="traduction.php">16eb6bbf5daac70314b5480aa545de72</md5file>
-</dir>
-<dir name="/product/stats" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="contrat.php">2159447cc3546450f1822526524bc0fb</md5file>
-<md5file name="card.php">f37b46c4b0e08ea71383759d51cbca62</md5file>
-<md5file name="propal.php">645f5048914786b19f9ad6a5ebc01df2</md5file>
-<md5file name="commande_fournisseur.php">fbc3af2707bf059d3025f5d4c80e59e3</md5file>
-<md5file name="commande.php">97b1df5a4b9096c71a9838fa2e4128cf</md5file>
-<md5file name="facture.php">e7a3046378387654cf54c821f4d39ff9</md5file>
-<md5file name="facture_fournisseur.php">3568128b967fe47eacc7341497f120d4</md5file>
-</dir>
-<dir name="/product/dynamic_price/class" >
-<md5file name="price_global_variable.class.php">bf6fab07bb6fc9efb9af009a1245e59c</md5file>
-<md5file name="price_expression.class.php">e33dfe6255968ce78c4a1953fc529a61</md5file>
-<md5file name="price_parser.class.php">6d84eb5714dbc193b9c62415322f730d</md5file>
-<md5file name="price_global_variable_updater.class.php">d22ad962953e353432753deed2609d8c</md5file>
-</dir>
-<dir name="/product/dynamic_price" >
-<md5file name="editor.php">20c72a55796b1e64cff84f004b04e76b</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="price.php">530655125f0ab31a2406b744e62ae2e0</md5file>
-<md5file name="document.php">f15bf7e5916adfd39a30d1d984c28b75</md5file>
-<md5file name="card.php">aaca3ca32321aced0a33feaad8be2867</md5file>
-</dir>
-<dir name="/product/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="products.php">fbccc9c80db24316963f00108777de22</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="fournisseurs.php">e527016e816268701ba5d8a8c5133b83</md5file>
-</dir>
-<dir name="/product/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="service.class.php">3e8b72640f3dd0117bde24b366b7a8f5</md5file>
-<md5file name="propalmergepdfproduct.class.php">56ab66872574c4005a138883a610053c</md5file>
-<md5file name="html.formproduct.class.php">5c07caec4119e65b0f413c36382fc1fd</md5file>
-<md5file name="productcustomerprice.class.php">a651cfc57d02e13f28a7888e42936c6f</md5file>
-<md5file name="productbatch.class.php">eb8aec3b6223e224d7e0a3d275119d2c</md5file>
-<md5file name="product.class.php">7d586422806dee9c2b3b1bc2040c103a</md5file>
-<md5file name="api_product.class.php">d8bb05e304774532c20b3bfd2640be79</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="popuprop.php">8a25fb29361c57f65f703406ce45b358</md5file>
-</dir>
-<dir name="/product/canvas" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/product/canvas/product" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/product/canvas/product/tpl" >
-<md5file name="card_create.tpl.php">f14704ffdc07adae667d97b068a43256</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card_edit.tpl.php">d64e97da94df5bcc6b9e82a379085f61</md5file>
-<md5file name="list.tpl.php">b59142bd8cdcd219692f63fb46cd3a49</md5file>
-<md5file name="card_view.tpl.php">32b9f7e276353924351253cead6eef06</md5file>
-</dir>
-<dir name="/product/canvas/product" >
-<md5file name="actions_card_product.class.php">a08e46945e48cb6fb3f0364a0efa1005</md5file>
-</dir>
-<dir name="/product/canvas/service" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/product/canvas/service/tpl" >
-<md5file name="card_create.tpl.php">19d06d84b1b9df386b1cadc877a8c169</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card_edit.tpl.php">9828a8c09e33d2aabf40388aa3d71d56</md5file>
-<md5file name="list.tpl.php">977792fd978561c2f641a42ff3af515b</md5file>
-<md5file name="card_view.tpl.php">0bf49a329273647d1ab966c8bf1852b4</md5file>
-</dir>
-<dir name="/product/canvas/service" >
-<md5file name="actions_card_service.class.php">e0ea159b2cb390fedbffab55f4292315</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="index.php">46534b8826dcef70872a3eda1edaaff7</md5file>
-<md5file name="list.php">4e29bea0c5013afb255817dc9707a222</md5file>
-<md5file name="reassort.php">87180c4c308522bf458c8743c171ca8b</md5file>
-</dir>
-<dir name="/product/stock/tpl" >
-<md5file name="stocktransfer.tpl.php">29139a1bef436286870533a5ed8f29a9</md5file>
-<md5file name="stockcorrection.tpl.php">c300f5e0a2acf0e551181b99e73d86b5</md5file>
-</dir>
-<dir name="/product/stock" >
-<md5file name="product.php">101a0b273f2b9a41680969e990d7f452</md5file>
-<md5file name="massstockmove.php">b12dc16907aa1499ea6b6dfcc484baa2</md5file>
-<md5file name="replenish.php">d0673c8be1cb6b2572c370da9c3de827</md5file>
-<md5file name="card.php">8f99f0fd2ed217328dd4647819cba0bb</md5file>
-</dir>
-<dir name="/product/stock/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="entrepot.class.php">a7782dab95c860f764d112db2ef3be7a</md5file>
-<md5file name="mouvementstock.class.php">e40dcf4585bcbeb83f9e1b9a1bfbd46d</md5file>
-</dir>
-<dir name="/product/stock" >
-<md5file name="mouvement.php">bdf8a31adfd8883f96009ae9a31eb339</md5file>
-<md5file name="replenishorders.php">22a2ab52185732bcafd64fbd4a68eea8</md5file>
-<md5file name="index.php">7b425cd596259f2a3bd9a1ffb228d0de</md5file>
-<md5file name="fiche-valo.php">ebb2e597917e22900853dfa300de88da</md5file>
-</dir>
-<dir name="/product/stock/lib" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="replenishment.lib.php">2c6f884e37b89f861f19faba99009ecb</md5file>
-</dir>
-<dir name="/product/stock" >
-<md5file name="info.php">32df7d91f327cfdcd67d831f6e7535eb</md5file>
-<md5file name="list.php">4948f533a6a1eaefa51a4c7b8661e293</md5file>
-<md5file name="valo.php">9c15e013ef6cee78eeba5c41747d96a1</md5file>
-</dir>
-<dir name="/product/stock/img" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="yes.png">4776d6cefd9a868dc15fa24651c816b9</md5file>
-<md5file name="no.png">9069ff50c20cb96cb418f7b75c3a905b</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="reassortlot.php">8ca68c30b032befd4a730e7b8f06275e</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_extrafields.inc.php">74f1aaa602c0b44f4ffdc664eded1203</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default" >
-<md5file name="frmactualfolder.php">b3030bcc4e2bd43d736b75c03708a14a</md5file>
-<md5file name="spacer.gif">325472601571f31e1bf00674c368d335</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="browser.php">f6ceacf21d75d76838d8d0eb07b59b91</md5file>
-<md5file name="frmupload.php">bc3efe4654dfa1f79154f2544af4b884</md5file>
-<md5file name="browser.css">fee68244e60227c904bac3a3b6eee43f</md5file>
-<md5file name="frmfolders.php">c6cf0750015a364ebd1a9513662f7cce</md5file>
-<md5file name="frmcreatefolder.php">520e529510d541e2f6d55d4835d37676</md5file>
-<md5file name="frmresourceslist.php">8dcf9c8e0d9fd9279e7608571669a59e</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/images" >
-<md5file name="Folder.gif">08c5276ccec1e43cc5f3c6d0be5d2b8b</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/images/icons" >
-<md5file name="txt.gif">b8d07a4c4a294348b97c9bcfe2f85590</md5file>
-<md5file name="pdf.gif">3e8e56cfacb8c2bbf56f9d5535e531b6</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/images/icons/32" >
-<md5file name="txt.gif">edcd1c8ee9024895b5a4583722babe78</md5file>
-<md5file name="pdf.gif">ba4926ea53023adefd4e45924855b2a2</md5file>
-<md5file name="mp3.gif">582e2c081262467afb34b75cb2209cd4</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fla.gif">9c8237cfe69b78933a90446291cb4ae7</md5file>
-<md5file name="ppt.gif">5d2a464ef783e9ec70d12cbd0219b093</md5file>
-<md5file name="cs.gif">401bf37973a5828e589dc42d51a9ce41</md5file>
-<md5file name="default.icon.gif">98ecba6c3121fab9e9bd8a0d231291da</md5file>
-<md5file name="mdb.gif">ca7af6adbe7fc6713eef7aedeaff6d68</md5file>
-<md5file name="vsd.gif">e6b53f1b56eb92e0f6c7956389846860</md5file>
-<md5file name="exe.gif">a9b8b3dd2ca801db31096657f9feb223</md5file>
-<md5file name="avi.gif">d2f15a52c9b7cde60094357aee158f9a</md5file>
-<md5file name="png.gif">bcf30b9314c6e22f433cf63e070d5e2a</md5file>
-<md5file name="jpg.gif">07acabf847fef0e89e2bce0503630da3</md5file>
-<md5file name="xls.gif">9fd4dc6b29261e27a3510bb978a03e6f</md5file>
-<md5file name="zip.gif">6384cb5f1f2ee9d373aa7daa642aa37e</md5file>
-<md5file name="swt.gif">33a84dfb653999b51a2e7bf4ad9d61c4</md5file>
-<md5file name="ai.gif">d557ad90a880a8c4239afe23dfa338bb</md5file>
-<md5file name="xml.gif">2a6d089c130c02e956bfd09b24e471d8</md5file>
-<md5file name="htm.gif">23ba1414b6b41244e36280f806264949</md5file>
-<md5file name="rdp.gif">4f78f926e05049ba39465f6e6468161b</md5file>
-<md5file name="doc.gif">0b3ad9eaedd22ca346e7413749cf65d3</md5file>
-<md5file name="html.gif">23ba1414b6b41244e36280f806264949</md5file>
-<md5file name="dll.gif">f0e74b60a4bd86a7e3c72703ae35bdbd</md5file>
-<md5file name="bmp.gif">ebe5075d5d7f38954bdac5dc09ac7959</md5file>
-<md5file name="gif.gif">bbda4f35647bcd95d0c8ee59784c171c</md5file>
-<md5file name="swf.gif">4c5e0f1f033e3c5bf6262396bf67fa18</md5file>
-<md5file name="js.gif">d4fc315c5e2ead83751e8840a12f0bd5</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/images/icons" >
-<md5file name="mp3.gif">c05109777e57c2553f01444a13c901c5</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fla.gif">5c405b8797567aa10a74ba78e0a45779</md5file>
-<md5file name="ppt.gif">5518e2e6b0fae1d10afcff0855ac54d4</md5file>
-<md5file name="cs.gif">0a2d3ee44e20f13736fad04e7894b6df</md5file>
-<md5file name="default.icon.gif">bfa40282d9494b2a4d2999f1b0cc3fb9</md5file>
-<md5file name="mdb.gif">a313226470463b1cef10c0a9e9ef810c</md5file>
-<md5file name="vsd.gif">a8e7f6279b672b819e3587e82be2ecaa</md5file>
-<md5file name="exe.gif">1f38190b8213c46f62edaf39ee4638af</md5file>
-<md5file name="avi.gif">c05109777e57c2553f01444a13c901c5</md5file>
-<md5file name="png.gif">bee1a71bee296f6d1c70585fe47c6ef1</md5file>
-<md5file name="jpg.gif">c2ed5baccc767f4fdb09ac901f1b92e5</md5file>
-<md5file name="xls.gif">805d1cab1ef9a9a4fb9d5f6bc19599fc</md5file>
-<md5file name="zip.gif">08302bad21f1fa6c63e2676d8997c4c5</md5file>
-<md5file name="swt.gif">1e66ff16162d27c4f62f5f50321c27c5</md5file>
-<md5file name="ai.gif">1a5c6b584ccd998c0612fede27015d07</md5file>
-<md5file name="xml.gif">99113f9e888936076f1bfab0f118d75e</md5file>
-<md5file name="htm.gif">1411e223b68d5b52ffe1af867f60c4a4</md5file>
-<md5file name="rdp.gif">95c88179a187f4e5b646bc9ca87fe969</md5file>
-<md5file name="doc.gif">f810fc612aceaf61d59bdfb6070481c5</md5file>
-<md5file name="html.gif">1411e223b68d5b52ffe1af867f60c4a4</md5file>
-<md5file name="dll.gif">f70aeb96f2b1e6b321b8a0b33a0ec388</md5file>
-<md5file name="bmp.gif">72517dbfdffeee4aa7d31fd4bc08989a</md5file>
-<md5file name="gif.gif">84ad28425e6a6a24d92ebd0e072bacff</md5file>
-<md5file name="swf.gif">1e66ff16162d27c4f62f5f50321c27c5</md5file>
-<md5file name="js.gif">e015c12d2f9b5ecbe7d3dc4d40a3d403</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/images" >
-<md5file name="FolderUp.gif">191d2a2463a0166ac3be558bea018c72</md5file>
-</dir>
-<dir name="/core/filemanagerdol/browser/default/js" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fckxml.js">13c230e30f07c174594e9aa17fadabdb</md5file>
-<md5file name="common.js">be71fd70d4c569441bba4290a5f45ae9</md5file>
-</dir>
-<dir name="/core/filemanagerdol" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/filemanagerdol/connectors" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/filemanagerdol/connectors/php" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="upload.php">b4ac782d4faa1753d13b24ca99c87a6e</md5file>
-<md5file name="commands.php">b3446aab31273de311c70a0331790702</md5file>
-<md5file name="util.php">a820218b80b8490482654be08093cfca</md5file>
-<md5file name="config.php">7db229fdbab069ce531ee6db615115f7</md5file>
-<md5file name="connector.php">0a3152cd7649e57b9318603c240cab0a</md5file>
-<md5file name="basexml.php">db5b3613c8ede55626ab70594591229c</md5file>
-<md5file name="io.php">1fce4641b42b1c6680093428f2ccada5</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_setnotes.inc.php">255c511cf57d5c863564fd3ec0bae654</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="search_page.php">7a257121b2c9d54226e1e51d67232505</md5file>
-<md5file name="antispamimage.php">6b6851714ab5e4f9491c2500a26c8ceb</md5file>
-<md5file name="actions_fetchobject.inc.php">8236206d490740be0c025f905d8fedc5</md5file>
-</dir>
-<dir name="/core/tpl" >
-<md5file name="passwordforgotten.tpl.php">594c6fadbe917f7e36c7b72cfd6a6af2</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="error.tpl.php">080945adaf8304688ce778f8acc821fe</md5file>
-<md5file name="ajaxrow.tpl.php">c23f62f7e5f09cf5573f130a41f187ac</md5file>
-</dir>
-<dir name="/core/tpl/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fileupload_view.tpl.php">295dcb4f6b296bc1b2021c535ff02aa8</md5file>
-<md5file name="fileupload_main.tpl.php">5ef3117292cb272cb72190d67bda189d</md5file>
-</dir>
-<dir name="/core/tpl" >
-<md5file name="admin_extrafields_add.tpl.php">12493ac31aa1376058c5f1bb4eea48e1</md5file>
-<md5file name="resource_add.tpl.php">7f9a1be8e9e0bc6a5ac46129fe290b7d</md5file>
-<md5file name="originproductline.tpl.php">f0b37bba830b2bf5fc563baf227c34eb</md5file>
-<md5file name="footer.tpl.php">080945adaf8304688ce778f8acc821fe</md5file>
-<md5file name="login.tpl.php">c7a59c20d9909f290dab597e09ffa2be</md5file>
-<md5file name="bloc_showhide.tpl.php">8cc4b11d20b0e01eb7e7b7401c2f12c8</md5file>
-<md5file name="notes.tpl.php">10740fb22bfc2ac1b339e9d784cb9c23</md5file>
-<md5file name="extrafields_view.tpl.php">e72a1897ed9a078b81e72d66eb3895fc</md5file>
-<md5file name="objectline_create.tpl.php">ee2a09d80f4c4301c4c7a35dbac74255</md5file>
-<md5file name="document_actions_post_headers.tpl.php">29e218c7e580c35cf99d19f5876b1709</md5file>
-<md5file name="admin_extrafields_view.tpl.php">bd68e17f01cde910409d40075ec640bf</md5file>
-<md5file name="contacts.tpl.php">19841d0071556ffdf8fbe94d0cddd464</md5file>
-<md5file name="header.tpl.php">b7c3b27785924f5b023754855bbe3177</md5file>
-<md5file name="objectline_view.tpl.php">2775e6e61e2ab0bdfd17b7ed63dea86e</md5file>
-<md5file name="document_actions_pre_headers.tpl.php">83554ef1749b5f877cda2173c4fd71f2</md5file>
-<md5file name="admin_extrafields_edit.tpl.php">3c5adedd71ef8c08b8dfd0213767a814</md5file>
-<md5file name="resource_view.tpl.php">fa1602ccc625f1e35a7be5e0a2083020</md5file>
-<md5file name="objectline_edit.tpl.php">c4c69d5940cb93e0c41bdb62ff59a2f5</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_lineupdown.inc.php">a4a1f69d36f0c22e9eb2767ea3f0adbd</md5file>
-</dir>
-<dir name="/core/menus" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/menus/standard" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="empty.php">048dc07dc5cab8e296892a0a435244e0</md5file>
-<md5file name="eldy_menu.php">783b88cbef3e0dd4c05b607eae4aab9d</md5file>
-<md5file name="auguria_menu.php">85df266f4d854833292920582558e462</md5file>
-<md5file name="eldy.lib.php">30ba3a70b83586bd7f71fd3e9735841a</md5file>
-<md5file name="auguria.lib.php">30834b09409d2e8bdf19a7c03ee3e0c0</md5file>
-</dir>
-<dir name="/core/menus" >
-<md5file name="init_menu_auguria.sql">c89ef8b181cebf914f489a4849014df4</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="get_menudiv.php">7fbd04fb747c9df920e68d90c28f6853</md5file>
-</dir>
-<dir name="/core/ajax" >
-<md5file name="security.php">f0f3dd548f0117a3bb6905f9905ea76d</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="constantonoff.php">9ed54c7ee286304e07993b5812fc0cbf</md5file>
-<md5file name="price.php">d992798ae83fe2da2d0501997a8bc9ca</md5file>
-<md5file name="box.php">85a61fdff452eb8d12f7c76278a5b038</md5file>
-<md5file name="row.php">6ffc1d90d72e3ed0f20b128231e61593</md5file>
-<md5file name="ziptown.php">1f21cfd913214a20cfa2f7ae3ada25ff</md5file>
-<md5file name="objectonoff.php">ef26c4f25fa2beb7d37143476b866754</md5file>
-<md5file name="contacts.php">62b787e74da5d6c50c1bd97b356ab764</md5file>
-<md5file name="extraparams.php">78316df6af32ee9da5ced78338216bc8</md5file>
-<md5file name="bankconciliate.php">b4975423ce39701a8d04fc36264d796a</md5file>
-<md5file name="ajaxdirpreview.php">97283e3a351b02ab30f1d6b9174a6ca7</md5file>
-<md5file name="ajaxdirtree.php">a5b8ce85067c27e4ba0d40f305f84f8d</md5file>
-<md5file name="saveinplace.php">a211091c4c91768c4fd48b81a261be92</md5file>
-<md5file name="loadinplace.php">1d41db13a55daee5b2fb5cc28528c32c</md5file>
-<md5file name="vatrates.php">0d9c006af2fa9a68a117520b8fb0244d</md5file>
-<md5file name="fileupload.php">0a3bd48209e8dc9cba8cbde6a8acbdb5</md5file>
-</dir>
-<dir name="/core/class" >
-<md5file name="notify.class.php">97e07f15a54f43bd1f5d8040f1518514</md5file>
-<md5file name="html.formbarcode.class.php">1038e90233a2a8a55f004e9862cf506c</md5file>
-<md5file name="vcard.class.php">301a7689d42e301ca8ba3e4105c658c4</md5file>
-<md5file name="html.formadmin.class.php">727a2a09be20f951758ebda495f21819</md5file>
-<md5file name="openid.class.php">f1937e8c9562055c849883a5e39a42a5</md5file>
-<md5file name="smtps.class.php">c3b3d0abdbe29dfa600e25c414370231</md5file>
-<md5file name="html.formmargin.class.php">d29ea5774ef6055ff2a376efa8e1b629</md5file>
-<md5file name="cookie.class.php">2c7d88183b1aeeaa3c4fcffeb081cb86</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="html.formbank.class.php">424500cb5f9acf42cd8c95ab819fd320</md5file>
-<md5file name="html.formorder.class.php">62bad207f0d4f8630ef0d2a23a365574</md5file>
-<md5file name="link.class.php">d67feaff91ea41dbdb614dce38ba542f</md5file>
-<md5file name="workboardresponse.class.php">9d12d7b1dffb846c4c732a6017da3027</md5file>
-<md5file name="google.class.php">6a42f85c4852916c71548c179234aeef</md5file>
-<md5file name="canvas.class.php">0db78f95e23062feab46593d28704532</md5file>
-<md5file name="commonstickergenerator.class.php">d13a1b0fbbc6cafcecd93f460a494cbd</md5file>
-<md5file name="commonorder.class.php">084f9694188a61f84e337a78ed05441d</md5file>
-<md5file name="html.form.class.php">40d4b7bcf8ab72c9640862b4450c1332</md5file>
-<md5file name="html.formmailing.class.php">02c3c91fb006d3ae2e15455d1d559a91</md5file>
-<md5file name="html.formprojet.class.php">0fdcd38ce537746580c763cc3bad3867</md5file>
-<md5file name="html.formsocialcontrib.class.php">a5fa4f2f169cad1915a191fc151ad265</md5file>
-<md5file name="html.formactions.class.php">fc4eb48545c609f71eaaefb2e061d91b</md5file>
-<md5file name="commonobject.class.php">481ba4d57ac39c2afe7e74987c509503</md5file>
-<md5file name="html.formpropal.class.php">c663d2cee4ea71d024f2defd840527bc</md5file>
-<md5file name="hookmanager.class.php">4d33c44d7e7704e5e67b2bc7b183d8ba</md5file>
-<md5file name="html.formfile.class.php">f0bf2d1c291cff3b62bf2a656b32ea62</md5file>
-<md5file name="dolprintipp.class.php">52a5f7f52fe45bc60d38ca4a96194125</md5file>
-<md5file name="discount.class.php">51947a30f8a81923a63f5a0b92d756a0</md5file>
-<md5file name="doleditor.class.php">05bf526e791c88cef09875a2199a1f00</md5file>
-<md5file name="infobox.class.php">94cf1cf189b0f0a0d50411c4502ff252</md5file>
-<md5file name="menu.class.php">7ab52342b3b370b5b6f6298dc5d4c182</md5file>
-<md5file name="html.formintervention.class.php">4e6fa59e238b5d4855818e3197dc9931</md5file>
-<md5file name="dolexception.class.php">6cbfa567b0f4153bbc7f74adfe6bb4d2</md5file>
-<md5file name="extrafields.class.php">a50413b4e11d40568247b0f3aeb6edd1</md5file>
-<md5file name="translate.class.php">bf50bfa23a12e840e06fdf7f53e157b1</md5file>
-<md5file name="fileupload.class.php">ff02ed2bea96d88f500167a09413c7c0</md5file>
-<md5file name="html.formsms.class.php">59877377a38dd5dcee93798ea7923bee</md5file>
-<md5file name="commonobjectline.class.php">4b0797a4faaa9475bd19337f4825284e</md5file>
-<md5file name="ccountry.class.php">daff44759e4f9c193a667ed427ba5444</md5file>
-<md5file name="html.formmail.class.php">78035900d4df5bae90ad90077151b7f4</md5file>
-<md5file name="html.formaskpricesupplier.class.php">8ba37911c24d75473a9a07fc3dd3c371</md5file>
-<md5file name="dolgeoip.class.php">f4d35924864fb87b787ab9a9925fb091</md5file>
-<md5file name="ldap.class.php">c4eace6e4930731ba46b88be2bedad6a</md5file>
-<md5file name="interfaces.class.php">24e05a59dbe2e27dcd6bd1554f8d1695</md5file>
-<md5file name="html.formcontract.class.php">e584803860f66fdd09669edc27f3c18b</md5file>
-<md5file name="genericobject.class.php">e7df06c253dee16873fac26b32670722</md5file>
-<md5file name="ctypent.class.php">0bb1fb4ad3250cc312d571055323db79</md5file>
-<md5file name="events.class.php">ef5e6dcc9065d652696cc5e9b4613f20</md5file>
-<md5file name="antivir.class.php">ed773b5b64093d6017aecdf1ca79fef5</md5file>
-<md5file name="commondocgenerator.class.php">6bf888b0c4db10de3ac1c4d8c48ca495</md5file>
-<md5file name="dolgraph.class.php">5ab4686cbf0b0d798b37873a6c9bb3df</md5file>
-<md5file name="html.formcron.class.php">1889b6eeeef65ae427813873a606a06f</md5file>
-<md5file name="html.formother.class.php">126d87de4a1d8e863a5ad85f840caf2c</md5file>
-<md5file name="conf.class.php">f96b3c7931490587edba909bc2a3d73c</md5file>
-<md5file name="rssparser.class.php">4b09fb6f2102d0dc31cccb6a021a275c</md5file>
-<md5file name="CMailFile.class.php">56ca46312806229c2d361e9c46ab4533</md5file>
-<md5file name="fiscalyear.class.php">0b631c9349d4997aca6fa2bcd6a60fc7</md5file>
-<md5file name="commoninvoice.class.php">34a8dbdc41d76d2c95b702cc0c770f8b</md5file>
-<md5file name="stats.class.php">8f0274eded9c67119297f281fad2bf9b</md5file>
-<md5file name="menubase.class.php">445dc8957e4b73ac842bbfdc8cbbd243</md5file>
-<md5file name="html.formcompany.class.php">3db7079275b3e1ba0126ec337f998412</md5file>
-<md5file name="CSMSFile.class.php">3338b73e47bcad98695e11e3b32ebcfa</md5file>
-</dir>
-<dir name="/core/db" >
-<md5file name="sqlite.class.php">4ce6580013c820b13b2f59600a35c735</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mysql.class.php">c83d06b3dc2afbd5453b8e485ac38312</md5file>
-<md5file name="sqlite3.class.php">bf7a691239cd0c0677bdaf061d0ad837</md5file>
-<md5file name="DoliDB.class.php">289840af2b48d265fb46e11ddf2628da</md5file>
-<md5file name="pgsql.class.php">242288b2514820582ba09b42ff57e2f4</md5file>
-<md5file name="mssql.class.php">d40f2bc5d4e74945aff1b8663bf33d0f</md5file>
-<md5file name="Database.interface.php">e6aecd57572a5165653ffc7a9b283178</md5file>
-<md5file name="mysqli.class.php">9479b8ec2ca8b6bf847e69acf0905d9e</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_sendmails.inc.php">0105de39da47e5826bf8604b8b1e5a13</md5file>
-<md5file name="tools.php">a1bd66b209ee6f52c176d5d0f1c62da1</md5file>
-<md5file name="photos_resize.php">14632aa89ec3fafa4b2d795dcbfa57c9</md5file>
-</dir>
-<dir name="/core/lib" >
-<md5file name="ws.lib.php">dc056bd161ceeab388b54c28790ad27f</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="product.lib.php">e403f819edbccb676580a4bab5dc9b85</md5file>
-<md5file name="security2.lib.php">8ffa067fe180a67ba149c4ae7f319b09</md5file>
-<md5file name="xcal.lib.php">67ba0ce54c69bd89a57e925941319ae3</md5file>
-<md5file name="contact.lib.php">07374752b32e65ac21f86c1801ada777</md5file>
-<md5file name="tax.lib.php">b6333dfcde8674d1f76a8fb5b8386627</md5file>
-<md5file name="emailing.lib.php">84b8be2d20c1d6d6811f0298d2234ca8</md5file>
-<md5file name="security.lib.php">223bb15e53ca059b66188e2c5d196195</md5file>
-<md5file name="member.lib.php">62ecdcff5b99f8bd94f75e2ab7eacd71</md5file>
-<md5file name="format_cards.lib.php">b45e62638dc04cdc8cac22d4c82a0c1e</md5file>
-<md5file name="geturl.lib.php">311530ce8300ab9eb82dfadc21dc6646</md5file>
-<md5file name="functionsnumtoword.lib.php">130ce96d80430c90a6998055db294685</md5file>
-<md5file name="salaries.lib.php">93d1ba6dd796c844428cf9149ee2e801</md5file>
-<md5file name="bank.lib.php">44740af25aeae7888e239bc6f3ecd36c</md5file>
-<md5file name="fourn.lib.php">4175f4b0b8b1bad303aa966c954ddc25</md5file>
-<md5file name="import.lib.php">6b58f5c0cad8d233b94b0874a41e4c7d</md5file>
-<md5file name="fiscalyear.lib.php">217a9db618180ecae18828a2efc375db</md5file>
-<md5file name="resource.lib.php">afee7ccb55d1420cc8e36da4657825d1</md5file>
-<md5file name="trip.lib.php">1040bc90a4146aba3e12b547710fd290</md5file>
-<md5file name="donation.lib.php">dd2a3e53ff70e9913a1f44a65992e83e</md5file>
-<md5file name="categories.lib.php">1258865536912e11c70ae0c343576d11</md5file>
-<md5file name="cron.lib.php">07e043e1c42a0fe90d2226eaacb013e2</md5file>
-<md5file name="accounting.lib.php">f6d4c9c91e2608f8ae916ddf86816560</md5file>
-<md5file name="project.lib.php">1ac25140f51596243217b5ebcdad96fe</md5file>
-<md5file name="ajax.lib.php">78f6029aabbd9f1e2568187f7d2f98c9</md5file>
-<md5file name="order.lib.php">a969dd13ed2ab6f921564ecd22121515</md5file>
-<md5file name="json.lib.php">ef0ba347561ad5fcd763fabb899bfad0</md5file>
-<md5file name="usergroups.lib.php">487b0c9b855ee29b3f079d5d885130cd</md5file>
-<md5file name="images.lib.php">fb6dfe418a92f6803616c17def007cd2</md5file>
-<md5file name="sendings.lib.php">48cf595e8d99291e756b6f0945c4a656</md5file>
-<md5file name="ldap.lib.php">60c540c4dfb653ef65e67a628645f590</md5file>
-<md5file name="agenda.lib.php">27e975f676e3cda57ed150f82a970644</md5file>
-<md5file name="functions2.lib.php">cc545e426ed2e735bd00cbab8db381bd</md5file>
-<md5file name="stock.lib.php">98ca2d412c720690b46b8bf566cf4fb5</md5file>
-<md5file name="propal.lib.php">a9d45ffd6281800146fcfb2e3ab90ab6</md5file>
-<md5file name="fichinter.lib.php">66b21a3ea2de0ae271e470c339c40d07</md5file>
-<md5file name="treeview.lib.php">33293e2db3dedadfccccd5d6ac23eaf9</md5file>
-<md5file name="payments.lib.php">b416db3eacff1ad448692d14aadff327</md5file>
-<md5file name="date.lib.php">6e53a89f128e41918ccf5b20b96976b0</md5file>
-<md5file name="files.lib.php">1c73eacab2a1a619dc70e2f24fba4d1e</md5file>
-<md5file name="doc.lib.php">0bbc469b628cbc940ebdd59f2e218b6c</md5file>
-<md5file name="report.lib.php">eff5fc174c1ec328e58b76a3d70a5f2f</md5file>
-<md5file name="barcode.lib.php">116c4c10fccce8d73c9193e742834d3a</md5file>
-<md5file name="company.lib.php">f99ce992ef00dd16272190000ca9518d</md5file>
-<md5file name="memory.lib.php">dc63bf62b746ea8d1b1e7833675475d5</md5file>
-<md5file name="functions.lib.php">e5782fe8434c4a711e0d8b3d9c198d75</md5file>
-<md5file name="admin.lib.php">35cc6ac5381635a8a49523616f0d5e18</md5file>
-<md5file name="askpricesupplier.lib.php">595325924223d40b0ea97c9df4ebfde4</md5file>
-<md5file name="invoice.lib.php">aa7ebaddf8d815b3dfd1b3281f26de84</md5file>
-<md5file name="holiday.lib.php">a4bc5e69c8ddf4379a84b9c36588d6ca</md5file>
-<md5file name="expensereport.lib.php">c96798f2266b05d2c7fe35ad2226ce8f</md5file>
-<md5file name="price.lib.php">7494683dbd566b69f5913fec5a97b99d</md5file>
-<md5file name="contract.lib.php">6caf87260cfa1e46a3a9145ee88b89be</md5file>
-<md5file name="invoice2.lib.php">7097ba988bc2e9100b8857863e276932</md5file>
-<md5file name="functions_ch.lib.php">3cfbb9ef9c493bf739d501114cbe798c</md5file>
-<md5file name="prelevement.lib.php">4eaa5c0e7ce4116e821af9c6ce8c53ed</md5file>
-<md5file name="loan.lib.php">540b65a840a2f9876551a7963a2aa1bf</md5file>
-<md5file name="ecm.lib.php">48f9b2c134655de1b0f5f7d50f01b765</md5file>
-<md5file name="pdf.lib.php">be3c22b06cfbbc6e8771a5ba0f7447c3</md5file>
-<md5file name="mailmanspip.lib.php">70c6fc7d08f3c562322c9f53273f1393</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="doxygen.php">47b61de6de8e6ba33297c340f849928c</md5file>
-</dir>
-<dir name="/core/boxes" >
-<md5file name="box_factures_fourn_imp.php">a24dddda1a66ac83bb61ca34559694fc</md5file>
-<md5file name="box_actions.php">460429d5483ab7a26560b3bac3adb437</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="box_commandes.php">505eddd29e439ed2971f69ab8d38e289</md5file>
-<md5file name="box_propales.php">f44ef38f3ae6b30def1d8f4d8b309ba5</md5file>
-<md5file name="box_graph_invoices_permonth.php">68f1afb0ba44e0f93c89b4768001ddde</md5file>
-<md5file name="box_project.php">67e301d4222ce8df3e27dd2b6bacac0d</md5file>
-<md5file name="box_services_contracts.php">2616ba6e3e277acabedbe7b36114d851</md5file>
-<md5file name="box_fournisseurs.php">637f30cfefd948ec5aea16cc25f00f91</md5file>
-<md5file name="box_graph_orders_permonth.php">4cb7f6d97d38884b63a5adb65dc85870</md5file>
-<md5file name="box_ficheinter.php">8ce29863483ab28b83dda0eb041678e3</md5file>
-<md5file name="box_clients.php">36e6644d1f29852a1fade887ee5dc297</md5file>
-<md5file name="box_members.php">ea242d45e334f6ccf8667d6eefa897f9</md5file>
-<md5file name="box_graph_invoices_supplier_permonth.php">4ec1d00a283dde86f3d2d2dfe861322b</md5file>
-<md5file name="box_graph_propales_permonth.php">27899639279dd869734a9adfcca90928</md5file>
-<md5file name="box_task.php">d493e1ef8c48b934abc27c265511201c</md5file>
-<md5file name="box_contacts.php">e2e0d0f0e5f01a63b01051548ae2d046</md5file>
-<md5file name="box_graph_product_distribution.php">571c3314f679515eeb7e783e772a91d8</md5file>
-<md5file name="box_prospect.php">cf35607a99b98c2f1265fca99f012e39</md5file>
-<md5file name="modules_boxes.php">8b161e9605cb5167551218d6052ce08b</md5file>
-<md5file name="box_graph_orders_supplier_permonth.php">4635f7e2ec630f95a9c40f8a70e4a5ad</md5file>
-<md5file name="box_factures_fourn.php">b569393287bd79b472ea2ffddae509d0</md5file>
-<md5file name="box_comptes.php">bad676eea7524bc274e069c4bad959ee</md5file>
-<md5file name="box_factures_imp.php">6b972a0e3244ed24f7677b8f54823f42</md5file>
-<md5file name="box_bookmarks.php">23d61ece0d5dc54bf7289f5089cafc6f</md5file>
-<md5file name="box_produits.php">32042dcd19771c7e6284bd7647218438</md5file>
-<md5file name="box_contracts.php">0035f9b29bda926156cd36c0a8d1203d</md5file>
-<md5file name="box_external_rss.php">d09f346786a0d3f499c82632efdc513a</md5file>
-<md5file name="box_produits_alerte_stock.php">95d5483b7b0fe93613c6f92fecc3693e</md5file>
-<md5file name="box_factures.php">8116cf0180c6b6f8f92811877388f2e5</md5file>
-<md5file name="box_supplier_orders.php">a15246ccf08fa8457bccaafba911571c</md5file>
-<md5file name="box_services_expired.php">da4407057f3825372d0244bb03d4de0b</md5file>
-<md5file name="box_activity.php">78de81afa98ce42409be1cd40f78977a</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_printing.inc.php">8c78f30a301fd7c5092ed59d95f2f688</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modSociete.class.php">24a809523f01561d398e69640b4177a9</md5file>
-</dir>
-<dir name="/core/modules/member" >
-<md5file name="modules_cards.php">9f4114f75bc477d32d3eee0964ce9538</md5file>
-</dir>
-<dir name="/core/modules/member/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_standard.class.php">4c126f4df7a6cb7922328989adb0e4e9</md5file>
-</dir>
-<dir name="/core/modules/member" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/modules/rapport" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_paiement.class.php">d5c21facbb1b56e3cad3749b7d0512be</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modDeplacement.class.php">998586e946d5bfd3c5cdec06f59197be</md5file>
-<md5file name="modDynamicPrices.class.php">a8e40eab967d374369a9c2ebeff3f17c</md5file>
-<md5file name="modImport.class.php">03b977acb32cacc51e89dc4446c7a8a0</md5file>
-</dir>
-<dir name="/core/modules/action" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="rapport.pdf.php">93e6457929d7e0366360e7380aa8957a</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modCashDesk.class.php">69982f8171837cd8669bfe9c2f08dc8f</md5file>
-<md5file name="modLdap.class.php">ddf6dfeb77c98411b4d5434f20c24483</md5file>
-<md5file name="modFacture.class.php">c23010fa68c5996cb5977f84a6bb7ceb</md5file>
-<md5file name="modSyncSupplierWebServices.class.php">90a300e9bd857966226c68dca8660456</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modIncoterm.class.php">b4e9f07aa5268af49d3bb9429719b201</md5file>
-<md5file name="modFTP.class.php">8293bd60fe13ac64c22f8500b346821c</md5file>
-<md5file name="DolibarrModules.class.php">dcf77950d1dae6b1e4eb4c8473318bac</md5file>
-<md5file name="modCategorie.class.php">413af6ca18377689660d2b2eeed2be98</md5file>
-<md5file name="modOpenSurvey.class.php">d2df1ec90f2bebb3ebfb74eba81bcec7</md5file>
-<md5file name="modAskPriceSupplier.class.php">c3b801c60645dff594d33cf0acc43fa5</md5file>
-</dir>
-<dir name="/core/modules/printing" >
-<md5file name="printipp.modules.php">de943e7a2b8a603c3ebc34507309a46d</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="printgcp.modules.php">4c7ae76e7bfcc26d6e030319fe556ef7</md5file>
-<md5file name="modules_printing.php">eac58079934a9b7df5b0239980a09102</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modDocumentGeneration.class.php">bd98e5ab25a629b3ad77dbd8d65f57f9</md5file>
-<md5file name="modCommande.class.php">7ffdea19b2579687fc084642e9ded32e</md5file>
-<md5file name="modSkype.class.php">e24d593b65305e01b074d405391f26b6</md5file>
-<md5file name="modSyslog.class.php">1decbba7d8c340e96fef7e7c8f76cec5</md5file>
-<md5file name="modProduct.class.php">6c964cc174572200dc704eef7928b33e</md5file>
-</dir>
-<dir name="/core/modules/contract/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_strato.modules.php">1dbcebdf0ca125ced506b39a0e4a29b7</md5file>
-</dir>
-<dir name="/core/modules/contract" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_contract_serpis.php">4553664f3a8bd058468c8fe3a6622db9</md5file>
-<md5file name="mod_contract_magre.php">7ffccecde85645232cd150f4ceb54f8d</md5file>
-<md5file name="mod_contract_olive.php">f0e4f84ac2849eef8c8da252f2a875fd</md5file>
-<md5file name="modules_contract.php">32b93afec2aa49078d275f31e5bcfdb0</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modFckeditor.class.php">f15135e330ceb4d36cbb3d115337a69a</md5file>
-</dir>
-<dir name="/core/modules/barcode/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="phpbarcode.modules.php">088cf985b57584cfffabc472d81e0db0</md5file>
-<md5file name="tcpdfbarcode.modules.php">4a05f379a84fef6bd48c3afa7a95207d</md5file>
-</dir>
-<dir name="/core/modules/barcode" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_barcode.class.php">7af26733aec623cb978ec9e8c3a6f324</md5file>
-<md5file name="mod_barcode_product_standard.php">b5a01bef49b36577ec34e6e0956b8727</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modPrelevement.class.php">b64c20cb648e8af5082db258e235937e</md5file>
-<md5file name="modGravatar.class.php">e8beeb31ba3517a1c3858365072fa333</md5file>
-<md5file name="modApi.class.php">da423e7cd677fb61f72236ebd66088dd</md5file>
-<md5file name="modUser.class.php">a45190255cfbea389c3d9c7a617d130f</md5file>
-<md5file name="modExport.class.php">7f20953dd1bbbc6a6bc7fe4aecd11fb5</md5file>
-</dir>
-<dir name="/core/modules/product" >
-<md5file name="modules_product.class.php">5a78d16a02c5aeb129cd550ec0a5c28a</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_codeproduct_leopard.php">97a9f29c0dc31ca7bfe79f69f3425c76</md5file>
-<md5file name="mod_codeproduct_elephant.php">53843c95c90b7200505f1e44ee5270bb</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modProductBatch.class.php">d7ce5caf474c325b8a660583b48df39e</md5file>
-<md5file name="modBarcode.class.php">dd9a08f8c03874b1fd5249a35922466d</md5file>
-</dir>
-<dir name="/core/modules/syslog" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_syslog_syslog.php">176884d4fccf888c6e7431804c74a14a</md5file>
-<md5file name="logHandler.php">94e9f6ce17a4651ac325bfee0ac16c64</md5file>
-<md5file name="mod_syslog_firephp.php">8fd1f79367ca1fe345076df77337dce5</md5file>
-<md5file name="logHandlerInterface.php">f565e3ddf9bc9395ac47dcea255b1cd9</md5file>
-<md5file name="mod_syslog_file.php">8881a25817ad44b4a24d22b129c08204</md5file>
-<md5file name="mod_syslog_chromephp.php">49d161798e5233c661462d1ba993970f</md5file>
-</dir>
-<dir name="/core/modules/export" >
-<md5file name="export_csv.modules.php">c47c2dc804e697e11c3f4ce54e0b0011</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_export.php">fcc8eb9209d42bb5bef2f9c3f4984b87</md5file>
-<md5file name="export_excel.modules.php">272f374309d523038d10b4ca8565352b</md5file>
-<md5file name="export_tsv.modules.php">1971aac78dbeb00bd73cd58de2923d63</md5file>
-<md5file name="export_excel2007.modules.php">4a3fbf99bbd978bb9d145282c6092ee2</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modResource.class.php">0bf2e38d4ce8df49eea23b091ea492f1</md5file>
-<md5file name="modBanque.class.php">26eac71fe10cf9b45357d18da527bd63</md5file>
-</dir>
-<dir name="/core/modules/security/generate" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modGeneratePassPerso.class.php">f63628897fdb4a183081fe4fd0010d7a</md5file>
-<md5file name="modules_genpassword.php">64eb1354ac6c51821c0980ff8edc544a</md5file>
-<md5file name="modGeneratePassStandard.class.php">0a846aab804b6db6c1e9fb50a5081fb6</md5file>
-<md5file name="modGeneratePassNone.class.php">2412c043ecec8cd25ea9a03e460f052a</md5file>
-</dir>
-<dir name="/core/modules/security" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modContrat.class.php">929e64d2c69c504b6294a337d78b91d0</md5file>
-</dir>
-<dir name="/core/modules/societe" >
-<md5file name="mod_codeclient_elephant.php">3bdfbda286294b2d05d3d0f0620bda42</md5file>
-</dir>
-<dir name="/core/modules/societe/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_odt.modules.php">4b0639469c047f10c9c546331f6bba63</md5file>
-</dir>
-<dir name="/core/modules/societe" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_societe.class.php">b3d164a87826eef531dc9b46c62b1e2e</md5file>
-<md5file name="mod_codeclient_monkey.php">98696a105fcdecc8f00a2849ed36aed8</md5file>
-<md5file name="mod_codecompta_aquarium.php">25b5b4bb97f49c9a5ac015d1aaa0310f</md5file>
-<md5file name="mod_codecompta_panicum.php">4e99f17050caf177332e013fe7fe9e0c</md5file>
-<md5file name="mod_codeclient_leopard.php">7bc409d442508ec7f8638e4d710c6508</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modAgenda.class.php">37494105410d00a80f6c222894a8a94c</md5file>
-<md5file name="modAccounting.class.php">bb90a4e927cd7bdbadcb54ee217b8f07</md5file>
-</dir>
-<dir name="/core/modules/expedition/doc" >
-<md5file name="pdf_merou.modules.php">582dba6660f1d337715a4822f4dd9524</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_shipment_odt.modules.php">9b301131818ad7072d10624d9fce65b8</md5file>
-<md5file name="pdf_rouget.modules.php">9a3ec96f1345ddc401718776d6c95756</md5file>
-</dir>
-<dir name="/core/modules/expedition" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_expedition_ribera.php">cdcb97001ea2cbedc6261727dff64e0d</md5file>
-<md5file name="modules_expedition.php">db680645424dbfcec99503215405d2c1</md5file>
-<md5file name="mod_expedition_safor.php">c65eeac4d7c36b3af73c2408ce38fa09</md5file>
-</dir>
-<dir name="/core/modules/mailings" >
-<md5file name="fraise.modules.php">ffb86fbf0c869b72795cab7c16fc6d99</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="thirdparties.modules.php">4d1fa853732216f28ce54fcf8e4e6207</md5file>
-<md5file name="example.modules.php">1277e5c01232300f48a75b9b02bf6e4c</md5file>
-<md5file name="contacts3.modules.php">9b4de98bf9f90966db0305e9d8aa0de5</md5file>
-<md5file name="modules_mailings.php">7f9e9451a7893997bbda81950b9bf3da</md5file>
-<md5file name="contacts4.modules.php">934db34fc5470e87467d07401027b6ac</md5file>
-<md5file name="xinputfile.modules.php">640847d555597c2573213b5dc5515cf1</md5file>
-<md5file name="framboise.modules.php">e8b39a8d6ef02915ddf04bbc93b92d82</md5file>
-<md5file name="thirdparties_services_expired.modules.php">184c417ca2d9d734f73867da2c1287f3</md5file>
-<md5file name="contacts1.modules.php">ae0615307ed643d4c7b0e0bfe4b7e45b</md5file>
-<md5file name="contacts2.modules.php">011f89953f9ad322e178a8d183de886e</md5file>
-<md5file name="xinputuser.modules.php">9836a974ec46db2376f688070eb5f577</md5file>
-<md5file name="pomme.modules.php">4bbee56e9f7b9e39373a5afc8983bd22</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modExpenseReport.class.php">348ed0a286dd5e2c43d90a6c0f28e3e6</md5file>
-</dir>
-<dir name="/core/modules/dons" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="html_cerfafr.html">47cdd134f11d6167cba1dd440c90bfb4</md5file>
-<md5file name="html_cerfafr.modules.php">40b6de62b1c5150dbc1301ed91361879</md5file>
-<md5file name="modules_don.php">7d605e5564840c03d4ac31ddad615c31</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modHoliday.class.php">1cec18c78a994077bdd1f3220f0c89d2</md5file>
-<md5file name="modNotification.class.php">75dadfb0411c68a97cffc44bbd7bbb8e</md5file>
-<md5file name="modFournisseur.class.php">4e72194cb13c3c6e40abbeabfc63b1b3</md5file>
-</dir>
-<dir name="/core/modules/facture/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_invoice_odt.modules.php">6b8b8ce50599e40cb74603a883f5d49b</md5file>
-<md5file name="pdf_crabe.modules.php">eb4430a638d6c94ba5e1d0114babe300</md5file>
-</dir>
-<dir name="/core/modules/facture" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_facture_terre.php">c6e5ab0aa652dc51731fc48b41c995ff</md5file>
-<md5file name="mod_facture_mars.php">1f2f0ef6ee0d0be328ce2a63b62b9e00</md5file>
-<md5file name="mod_facture_mercure.php">2c06092e1620c0a27cf264e1fb56ea02</md5file>
-<md5file name="modules_facture.php">2f711cd15f3d1808bc190e46f9770e29</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modClickToDial.class.php">7b82d8b4f260bf77647648b2c691f5ef</md5file>
-<md5file name="modStock.class.php">3d95525f908de5a02cd5218893e04602</md5file>
-<md5file name="modCron.class.php">4ec0b3b616a0298a698385da45464506</md5file>
-<md5file name="modPaybox.class.php">5976e30c457bcfd8152c783869aa44f5</md5file>
-</dir>
-<dir name="/core/modules/cheque" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/modules/cheque/pdf" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_blochet.class.php">6f0310c8fb3d1720af3544ec789ae76b</md5file>
-<md5file name="modules_chequereceipts.php">3f870cc77afc8277b700c1492dd0d75f</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modDon.class.php">55c5f68e0b44d29127739462be1da2ff</md5file>
-<md5file name="modWebServices.class.php">cf35ef4c0d5285ba00fa8e651cfbde50</md5file>
-<md5file name="modPaypal.class.php">760e788770fa00311687d3b98710a2d6</md5file>
-<md5file name="modBookmark.class.php">981b343d89fd2c32200bcf32deb07128</md5file>
-<md5file name="modLoan.class.php">ef43c627d7df9158523df21755262f40</md5file>
-</dir>
-<dir name="/core/modules/livraison/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_typhon.modules.php">ca77104ab1e9cd060e5fc12061f54b93</md5file>
-</dir>
-<dir name="/core/modules/livraison" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_livraison_saphir.php">a64def4ba4a8a55272108f79d0667e39</md5file>
-<md5file name="modules_livraison.php">5b110fb85ff4aafe377255ee3f01252c</md5file>
-<md5file name="mod_livraison_jade.php">b3f46a3f7cc553bcda255db88fd2309a</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modECM.class.php">03ffdb8b37122df3823dccc947fc944c</md5file>
-<md5file name="modWorkflow.class.php">fe46f69ee9c9a7cbf321c71e5c3e3fd3</md5file>
-<md5file name="modTax.class.php">6b01669d177f1a614085b407538555d9</md5file>
-<md5file name="modExternalRss.class.php">e1efd5d8bc348da70c325a08fc8c37a8</md5file>
-</dir>
-<dir name="/core/modules/askpricesupplier/doc" >
-<md5file name="pdf_aurore.modules.php">6819b7ceadc741bfb34cc11333fb3d30</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_askpricesupplier_odt.modules.php">13e7a0e137341f5a38764ea645b425f8</md5file>
-</dir>
-<dir name="/core/modules/askpricesupplier" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_askpricesupplier_marbre.php">e4239be8b90a077f8afc116e683151c9</md5file>
-<md5file name="mod_askpricesupplier_saphir.php">751806f248816fea7429cc7c4132539b</md5file>
-<md5file name="modules_askpricesupplier.php">13e922bcc8c5b80bccd436037b6d1983</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modProjet.class.php">74bda525f0dda4ec97c808e29637ecb6</md5file>
-</dir>
-<dir name="/core/modules/project/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_baleine.modules.php">551b419a1f4c4a63810438873229bcff</md5file>
-<md5file name="pdf_beluga.modules.php">086b2b45b9a2fe748f229b9bc66c2b5f</md5file>
-<md5file name="doc_generic_project_odt.modules.php">083e92b90c1d1b8d2fc0bf53f82fe24d</md5file>
-</dir>
-<dir name="/core/modules/project" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/core/modules/project/task/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_task_odt.modules.php">372f6b7405c871be138137fc693ace0b</md5file>
-</dir>
-<dir name="/core/modules/project/task" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_task.php">17c5319c940eb3104add1eb9e101fa12</md5file>
-<md5file name="mod_task_universal.php">8d9da26640fc68bb5b410b1e2b045146</md5file>
-<md5file name="mod_task_simple.php">dd6a5fb7d43469dbd615a20d87f3d3a7</md5file>
-</dir>
-<dir name="/core/modules/project" >
-<md5file name="modules_project.php">e1325f546f1962d12fec91a77bc51d8d</md5file>
-<md5file name="mod_project_universal.php">479a15c5d54330ed02283720b48ba8d0</md5file>
-<md5file name="mod_project_simple.php">67aacfba9a773fd702d1cbdb527c2389</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modAdherent.class.php">72dafdaa273c97150cf8ef3605c049df</md5file>
-</dir>
-<dir name="/core/modules/printsheet/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_tcpdflabel.class.php">c89b1bc5e14f24865577a17f6e90a7e8</md5file>
-<md5file name="pdf_standardlabel.class.php">43713fb171f594ff8816da84b61f5284</md5file>
-</dir>
-<dir name="/core/modules/printsheet" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_labels.php">5d81526d6d239037a39a5ff396552a71</md5file>
-</dir>
-<dir name="/core/modules/supplier_order" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_commande_fournisseur_muguet.php">641809cdd14d1a4d72cfd92cb37c2c33</md5file>
-</dir>
-<dir name="/core/modules/supplier_order/pdf" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_muscadet.modules.php">9781398536d1483f5c9c342933099d6e</md5file>
-</dir>
-<dir name="/core/modules/supplier_order" >
-<md5file name="mod_commande_fournisseur_orchidee.php">bcc3831429d49ff3a32c645c64be2e0e</md5file>
-<md5file name="modules_commandefournisseur.php">25fe73dfb05c08526e94d7ba7f241d9e</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modMailmanSpip.class.php">e55b01cb8e535d7dc9430a15a8a67444</md5file>
-<md5file name="modPrinting.class.php">aee7564b27ba5450152d80002f1fba64</md5file>
-</dir>
-<dir name="/core/modules/fichinter/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_soleil.modules.php">cfc998dcaf5626e19faf48057f6dcc7a</md5file>
-</dir>
-<dir name="/core/modules/fichinter" >
-<md5file name="modules_fichinter.php">7837f5bb514cfff0e661cf8f6a2b7f1d</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_pacific.php">2f133b07231a558b4551cfe813b6dd92</md5file>
-<md5file name="mod_arctic.php">ccba00148532ae0e30f6f1d082817c10</md5file>
-</dir>
-<dir name="/core/modules/import" >
-<md5file name="import_csv.modules.php">cfd65ed7d1e5c10932275567109144ed</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_import.php">5828492fffa3239827af9cbd350fe1a7</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modService.class.php">e4aec9b1bb5900b06ef83afde3b4f808</md5file>
-<md5file name="modFicheinter.class.php">cb8d00fea4038cdb54e050ae6de48a52</md5file>
-<md5file name="modPropale.class.php">8b6661a6f4c699a8cd97427ab0ee08d1</md5file>
-<md5file name="modSalaries.class.php">49d1f028330d8dad4880aa0c660c9ebc</md5file>
-<md5file name="modLabel.class.php">8d614ddd6b6545db3c21bf5a0ee84819</md5file>
-<md5file name="modComptabilite.class.php">a40db54a993475953aa25bbef592d0e3</md5file>
-<md5file name="modGeoIPMaxmind.class.php">673b31203f66bc4c61d0b84014515e00</md5file>
-<md5file name="modExpedition.class.php">bca52b63f254776be7ab1804bf7a062b</md5file>
-</dir>
-<dir name="/core/modules/supplier_invoice" >
-<md5file name="mod_facture_fournisseur_cactus.php">b5b8aca26aec574d1ab401fe8411e144</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="modules_facturefournisseur.php">333ac1e7adfa40f4e0fdec7872c6dbd5</md5file>
-</dir>
-<dir name="/core/modules/supplier_invoice/pdf" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_canelle.modules.php">2876daab1184996d57d657a8d46b1117</md5file>
-</dir>
-<dir name="/core/modules/supplier_invoice" >
-<md5file name="mod_facture_fournisseur_tulip.php">898b153724a1748b8ea360e0b94aba77</md5file>
-</dir>
-<dir name="/core/modules/commande/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="pdf_proforma.modules.php">0f7bbaf52bc8737d3a20ff0822895e6a</md5file>
-<md5file name="pdf_einstein.modules.php">2783cf290e6cbfdf4bc3fb56e2d40191</md5file>
-<md5file name="doc_generic_order_odt.modules.php">5cba7b9316b591829c756097ae0485cb</md5file>
-</dir>
-<dir name="/core/modules/commande" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_commande_marbre.php">1f669f066fd46b6c9ca05177e177ed23</md5file>
-<md5file name="mod_commande_saphir.php">3c270b13f4a5b576799d30edf1b7061c</md5file>
-<md5file name="modules_commande.php">5a24a30915985f4921e9977ef5591d37</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modMargin.class.php">38c48f781dec1c3d5af764d1a186e273</md5file>
-</dir>
-<dir name="/core/modules/expensereport" >
-<md5file name="modules_expensereport.php">581bf4f5d80169d20b9ac13270b44e0c</md5file>
-</dir>
-<dir name="/core/modules/expensereport/doc" >
-<md5file name="pdf_standard.modules.php">26da4a328f29f8936e291e83de0b4c5d</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modExternalSite.class.php">95cefbf95698a54bc23c935f43f2dcd6</md5file>
-</dir>
-<dir name="/core/modules/propale/doc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc_generic_proposal_odt.modules.php">4dfcdf4d3cb3af826834c1fbb852f513</md5file>
-<md5file name="pdf_azur.modules.php">848dda602b15a270752ab3d14d83e2b6</md5file>
-</dir>
-<dir name="/core/modules/propale" >
-<md5file name="modules_propale.php">469386ee98ede1646eb80de2443edb92</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mod_propale_marbre.php">fc2cd8f1b832bcd093d8f65cf48d6be1</md5file>
-<md5file name="mod_propale_saphir.php">eea69eebcbf32860db846f30a803b9e5</md5file>
-</dir>
-<dir name="/core/modules" >
-<md5file name="modMailing.class.php">fde7ea38cf5e65adbf47bd6453eeb1b2</md5file>
-</dir>
-<dir name="/core/login" >
-<md5file name="functions_ldap.php">ec2b8a20ae51bead882df818e695f524</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="functions_http.php">ee214e8c71603d61080656642677e373</md5file>
-<md5file name="functions_empty.php">5142e675c05915758d5da85ebc75eda9</md5file>
-<md5file name="functions_dolibarr.php">556f5e74c653d76e2f33c3020231941f</md5file>
-<md5file name="functions_openid.php">1be28ef0c48511a574aaec4e85b82042</md5file>
-<md5file name="functions_forceuser.php">ea1fc88b5959bf491d98ef06a82efdc8</md5file>
-</dir>
-<dir name="/core/triggers" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="interface_50_modAgenda_ActionsAuto.class.php">c237d4cfa770da16787a7ff6dfca94f7</md5file>
-<md5file name="interface_20_modWorkflow_WorkflowManager.class.php">1c5229194acda10b85b7851bc12675a4</md5file>
-<md5file name="interface_50_modNotification_Notification.class.php">a9332e0cf7eb8741e9857364a142b72e</md5file>
-<md5file name="dolibarrtriggers.class.php">04e25214030172ae5a0c4a390698ab55</md5file>
-<md5file name="interface_50_modMailmanspip_Mailmanspipsynchro.class.php">6d3e6d6ff9114516a80456e5a6834337</md5file>
-<md5file name="interface_20_modPaypal_PaypalWorkflow.class.php">aaa73e4fd80976e78fec2ae8ea9c3d07</md5file>
-<md5file name="interface_50_modLdap_Ldapsynchro.class.php">7e24728bb80f7be5ff656fb47737baad</md5file>
-<md5file name="interface_20_all_Logevents.class.php">f4938bd6e57a721cf8a7334599513831</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="datepicker.php">61ddd9841e1017b4654355ded8b4133c</md5file>
-</dir>
-<dir name="/core/js" >
-<md5file name="jnotify.js">1390ded165db331385a1a0b5873c2da5</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="lib_photosresize.js">8a34202e7012f992d9dd2adb1ca533b4</md5file>
-<md5file name="lib_head.js">8182c78486ec04ef7effe8dc698515b9</md5file>
-<md5file name="editinplace.js">a24a4e8582b19a3d805e6cbf21a6a1a2</md5file>
-<md5file name="datepicker.js.php">bcff6120a04c2644c3139ab28b982506</md5file>
-<md5file name="lib_batch.js">02c41413bcc17b24738048dd4454300b</md5file>
-<md5file name="lib_rare.js">be1a34c1c77c5431dfcee9caaabcfd88</md5file>
-<md5file name="timepicker.js.php">f71705be8958fd18f828eb64eb254202</md5file>
-<md5file name="timesheet.js">2073ab08b1875d5f37194576d7e2664e</md5file>
-<md5file name="dst.js">8410bfc136a141a1218b9ad4f096163b</md5file>
-<md5file name="blockUI.js">d0889baa672fc0c803bf11ba7f57f6b1</md5file>
-</dir>
-<dir name="/core" >
-<md5file name="actions_dellink.inc.php">a1476a351c5d531ffc9faf014373056b</md5file>
-</dir>
-<dir name="/loan" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="document.php">a34311c1fed3abafb4f451355d06980b</md5file>
-<md5file name="card.php">a4a7e6b3bf2a17d2bcded5e59623012a</md5file>
-<md5file name="note.php">d8933061942eb3a0528e7709332afbb2</md5file>
-</dir>
-<dir name="/loan/payment" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">c6b4cb32b33a17c1db4acac3d2e0367d</md5file>
-<md5file name="payment.php">7ab4bd91de174534d2630a02eb2494a1</md5file>
-</dir>
-<dir name="/loan/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="loan.class.php">ed3284b96a7046390d4908750cc91497</md5file>
-<md5file name="paymentloan.class.php">055a54d8fe702d8f3eff87434121d0cd</md5file>
-</dir>
-<dir name="/loan" >
-<md5file name="calc.php">04222a58ff4ba71159b6473d99bce41c</md5file>
-<md5file name="index.php">2b80628516b37350e8d5e4a374acddb6</md5file>
-<md5file name="info.php">57365dc182ed21f3827269df880499b3</md5file>
-</dir>
-<dir name="/webservices" >
-<md5file name="server_productorservice.php">f720c9967f7a94a18a3503b953491b63</md5file>
-<md5file name="server_order.php">5194d17e44944e823af4e5afc4928fd5</md5file>
-<md5file name="server_thirdparty.php">96a50298fb2ee665dd27034502f2c4ef</md5file>
-</dir>
-<dir name="/webservices/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="webservices.php">edbe4e266125cd1d5513b15dcabd6178</md5file>
-</dir>
-<dir name="/webservices" >
-<md5file name="server_user.php">d92251a50ab286a466dda724e2417454</md5file>
-<md5file name="server_invoice.php">b633fcd1170ea27d5b398eff376091b4</md5file>
-<md5file name="server_other.php">600e39cecc179fc8dffab41c2e519862</md5file>
-<md5file name="server_supplier_invoice.php">1a47a847fe417086b3f0b8d467d35d1b</md5file>
-<md5file name="server_actioncomm.php">b69b43bab30c28687680635f91a53017</md5file>
-<md5file name="index.php">311aab84570c363ed4ff7e5069f5d949</md5file>
-<md5file name="server_contact.php">b3af739e2c5343e75191918c6ce33bfc</md5file>
-<md5file name="server_category.php">6bcc750e4e3bcf3e3f130e84fa76c000</md5file>
-</dir>
-<dir name="/exports" >
-<md5file name="export.php">a34e477e026937ded25b3db75628102f</md5file>
-</dir>
-<dir name="/exports/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="export.class.php">67e7486726fb7e6b1ee021ce84bc9cfb</md5file>
-</dir>
-<dir name="/exports" >
-<md5file name="index.php">d93c6b0e8c40afea1cb04473e7125fad</md5file>
-</dir>
-<dir name="/resource" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="add.php">cc73bdc8577f20aba162d28c828ad90f</md5file>
-<md5file name="card.php">3f14cc8cba3c19889f962fee0095f0c1</md5file>
-</dir>
-<dir name="/resource/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="resource.class.php">9d44d20ef0991f1697d7060213c2493f</md5file>
-<md5file name="html.formresource.class.php">c6c90963b5d4c740e6fa50906f101d66</md5file>
-<md5file name="actions_resource.class.php">37bb963c5dadc996a1a96c433fc281d8</md5file>
-</dir>
-<dir name="/resource" >
-<md5file name="element_resource.php">2dd8e88a6957fabf71b1f96f1a16be17</md5file>
-<md5file name="list.php">5b5b52ff72d105f06dbf0d41b6468f32</md5file>
-</dir>
-<dir name="/resource/img" >
-<md5file name="object_resource.png">0f5edd10e423f8ad19ff6ccb3e0f0d5e</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="resource.png">5c64a4b4685177a38b565bad7b9b687d</md5file>
-</dir>
-<dir name="/societe/checkvat" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="checkVatPopup.php">778c4982f6d3788dbbd71cd005ac4e71</md5file>
-</dir>
-<dir name="/societe" >
-<md5file name="agenda.php">7c62bec97b5bc04de0c593aebb28c3bb</md5file>
-</dir>
-<dir name="/societe/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linesalesrepresentative.tpl.php">6a4676f26cc4774608c53cd47ae76efa</md5file>
-</dir>
-<dir name="/societe/admin" >
-<md5file name="societe_extrafields.php">ff6d2d9d347d509cc2dd12cb883dae26</md5file>
-<md5file name="contact_extrafields.php">6e8714f5bfec0e6e15bb43ce7416137a</md5file>
-<md5file name="societe.php">9c144f63803c26a995df268830bc4a89</md5file>
-</dir>
-<dir name="/societe" >
-<md5file name="ajaxcountries.php">366995b763c1aead04b0b2f0a125038f</md5file>
-<md5file name="price.php">c0f374d9ff494271ae5cbb27a09846d1</md5file>
-<md5file name="societecontact.php">c239aa6287f01ee787c1a437089e5b5b</md5file>
-<md5file name="document.php">53ff7f8c058d42c8be873e4ee5ae6dce</md5file>
-</dir>
-<dir name="/societe/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="company.php">8705dd72341375d93961d8fe65ac8a95</md5file>
-</dir>
-<dir name="/societe" >
-<md5file name="ajaxcompanies.php">79b8c989d344fdd08b832d875fb1e161</md5file>
-<md5file name="note.php">5315bd279f34c0ffbe43329c38eb036c</md5file>
-<md5file name="commerciaux.php">a2c3436e9e188ba9bb2653ce58bffc0e</md5file>
-</dir>
-<dir name="/societe/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="companybankaccount.class.php">1f21bb9a5810af59b93c076fd23f22f8</md5file>
-<md5file name="address.class.php">abdede0b95ba0317afc2b84d41c6d466</md5file>
-<md5file name="societe.class.php">5d52e0ea49c4d289ebcda2e1da293202</md5file>
-<md5file name="api_thirdparty.class.php">8132fb847569fa766adc0c4573f88d01</md5file>
-<md5file name="api_contact.class.php">890b8461abd8f0b87b126e9e770b9909</md5file>
-<md5file name="client.class.php">1f02fab7a9f6f9c4f7e6f55b70d39ad7</md5file>
-</dir>
-<dir name="/societe/canvas" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/societe/canvas/individual" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/societe/canvas/individual/tpl" >
-<md5file name="card_create.tpl.php">d655dedc0e57aef2764bc930bf99fb7d</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card_edit.tpl.php">48f7678b5664784c7eaf3f295b395d1e</md5file>
-<md5file name="card_view.tpl.php">ebe9c66c13750998aec15e19c74fd295</md5file>
-</dir>
-<dir name="/societe/canvas/individual" >
-<md5file name="actions_card_individual.class.php">1ac4641f6dff205071a01803b06887ef</md5file>
-</dir>
-<dir name="/societe/canvas" >
-<md5file name="actions_card_common.class.php">865ee06d70436c2d7a9eae83cbeca9af</md5file>
-</dir>
-<dir name="/societe/canvas/company" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/societe/canvas/company/tpl" >
-<md5file name="card_create.tpl.php">6c0827b57f73891866f6bff08599e987</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card_edit.tpl.php">beab4c4161bdaa1a850e545aace54e1d</md5file>
-<md5file name="card_view.tpl.php">f22bc6ed6086102114234b52a31c2727</md5file>
-</dir>
-<dir name="/societe/canvas/company" >
-<md5file name="actions_card_company.class.php">f4485433cb66de63f4478a8780c7e4b8</md5file>
-</dir>
-<dir name="/societe" >
-<md5file name="rib.php">11b50c97effbc90d2bb3a8fdfdf10d82</md5file>
-<md5file name="index.php">aec2cbb607f3e669bf11d95c6a2c2a57</md5file>
-<md5file name="info.php">9fb34a6db51d3aee921928ca1d42a3db</md5file>
-<md5file name="list.php">b6afeec640440ad686b7ce7ae0cc2a04</md5file>
-</dir>
-<dir name="/societe/notify" >
-<md5file name="card.php">98a5d4c239d3736d1f4d477225fa75f3</md5file>
-<md5file name="index.php">1921a40ef2e203a9c7e33e33d8481630</md5file>
-</dir>
-<dir name="/societe" >
-<md5file name="soc.php">20bd3b11f5fcbbcf18440a548e98db90</md5file>
-<md5file name="consumption.php">74a3eff04b216cdb9d6ec3e20df82f9f</md5file>
-</dir>
-<dir name="/expedition/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">6778428601c59efd1763f1d702fb1c78</md5file>
-</dir>
-<dir name="/expedition/stats" >
-<md5file name="month.php">c39db402b4563497e9c7270ef5db4cc9</md5file>
-<md5file name="index.php">7d040a1858a6f1e8b3d8e7fc68b1b008</md5file>
-</dir>
-<dir name="/expedition" >
-<md5file name="card.php">d2beb46931bb641bf0126092d91149fc</md5file>
-<md5file name="note.php">a267dd6d9a787dbaa95ee81e9812a81a</md5file>
-</dir>
-<dir name="/expedition/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="expeditionbatch.class.php">890365ca9e5d7857e3532d4c0366f94e</md5file>
-<md5file name="expeditionstats.class.php">b3586b44a75323dbf02f85aea44e25db</md5file>
-<md5file name="expedition.class.php">5ec9b9433c17cd7e39efe73b6ca47fdf</md5file>
-</dir>
-<dir name="/expedition" >
-<md5file name="contact.php">98b2b5f2c5fbc11b2d101f74e6f53550</md5file>
-<md5file name="index.php">dfc38f61ccb28814db587e30de81dbc1</md5file>
-<md5file name="list.php">e608bfdc1dcb6e0083ef2f07d6abcc80</md5file>
-<md5file name="shipment.php">3c7eb3a309b7b07b8a64dd1c04b1e652</md5file>
-</dir>
-<dir name="" >
-<md5file name="disabled.php">d9cb53a9d7329a35ccba6560d05ca39c</md5file>
-</dir>
-<dir name="/externalsite" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/externalsite/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="externalsite.php">6f61e08511b4cab9d57d208aa0603ccd</md5file>
-</dir>
-<dir name="/externalsite" >
-<md5file name="frames.php">cfdf29629eeab4fda683f7ce2db6e68a</md5file>
-<md5file name="frametop.php">cd5fd550b699c17d943e9f7758936537</md5file>
-</dir>
-<dir name="" >
-<md5file name="viewimage.php">098d6748b671ab8ff6b5fe8326181d44</md5file>
-</dir>
-<dir name="/adherents" >
-<md5file name="agenda.php">ef70e3dab477c099aa12fb1180a3c7a0</md5file>
-<md5file name="cotisations.php">884f200f728cff6292071327f3333432</md5file>
-</dir>
-<dir name="/adherents/admin" >
-<md5file name="public.php">4c4a05e064908129d88383e08a9a6975</md5file>
-<md5file name="adherent_extrafields.php">b78b788d5b3e07d4453369e56c1d659a</md5file>
-<md5file name="adherent_type_extrafields.php">f51c8778bc72faf4f5fd6f52f43b5238</md5file>
-<md5file name="adherent.php">626d8b5925475bd539d310df50ba813d</md5file>
-</dir>
-<dir name="/adherents" >
-<md5file name="card_subscriptions.php">1e3dfa1608ca11980bca3cde425ad19b</md5file>
-</dir>
-<dir name="/adherents/stats" >
-<md5file name="byproperties.php">8f950f0c02a403cf239f8e47bafdbbcf</md5file>
-<md5file name="index.php">69dcd2d08e96bfa3e71b39599c8754ed</md5file>
-<md5file name="geo.php">3dc697d1a8e9f73211e05cdbef38aa7a</md5file>
-</dir>
-<dir name="/adherents" >
-<md5file name="document.php">2f12577c1d455111bb528f3866b65893</md5file>
-<md5file name="card.php">5896d6563d302d330c365a3c64d8408b</md5file>
-<md5file name="note.php">280a1ab7fd33d892d6726f352e555c4d</md5file>
-<md5file name="ldap.php">68dc3ea2cd9c6508a925df50fa011221</md5file>
-<md5file name="type.php">85919d63e768559c976903b253070b04</md5file>
-<md5file name="fiche_subscription.php">deac83a4c0eda829eedb0f9136a1fae5</md5file>
-</dir>
-<dir name="/adherents/class" >
-<md5file name="adherent_type.class.php">8cd13a2c31d6b60f153cc120699a1e5f</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cotisation.class.php">c89f71e71b16be64c27c7859023fd58a</md5file>
-<md5file name="adherentstats.class.php">690c8e0cee2b6698e3b48fd0ac4de529</md5file>
-<md5file name="adherent.class.php">c120700122ee082bcd1bbfa5dd0398bc</md5file>
-</dir>
-<dir name="/adherents/canvas" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/adherents/canvas/default/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="adherentcard_create.tpl.php">d53398a9064775d5bf1ad2da53a497b7</md5file>
-<md5file name="adherentcard_view.tpl.php">0b343f1d661d5fa75128c811b7bd4459</md5file>
-<md5file name="adherentcard_edit.tpl.php">202aaf44cfdb9de3f06ecbb91eefa350</md5file>
-</dir>
-<dir name="/adherents/canvas/default" >
-<md5file name="actions_adherentcard_default.class.php">289d9a2960e260c7d015dd62c7d4cba7</md5file>
-</dir>
-<dir name="/adherents/canvas" >
-<md5file name="actions_adherentcard_common.class.php">502e4f24f3019034722099aba3960290</md5file>
-</dir>
-<dir name="/adherents/cartes" >
-<md5file name="carte.php">cca240d50ec70f59404618dff59c354a</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/adherents" >
-<md5file name="index.php">4d79f7743333ecca7616aad2fe558e05</md5file>
-<md5file name="info_subscription.php">866c20b40a82e12f5dfc6167586cdf5c</md5file>
-<md5file name="htpasswd.php">836fcb1eded545bbd9a2baeec41a4f62</md5file>
-<md5file name="info.php">9415a071a1be518bfc801462984551d4</md5file>
-<md5file name="list.php">a48291fa7995f310d18f6455df21cd47</md5file>
-</dir>
-<dir name="/accountancy" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/accountancy/admin" >
-<md5file name="journal.php">c60d0f1d436438bb9b08706282836b80</md5file>
-<md5file name="export.php">67e5082371dc15ec80d576bfb587ed24</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="productaccount.php">58a3b8ffe46325e8598e362c09ac0d98</md5file>
-<md5file name="fiscalyear_card.php">e59ae2f28213717bf033509c23cd2319</md5file>
-<md5file name="card.php">a7759db1bfe7c33b024751dc31e4aee3</md5file>
-<md5file name="account.php">d68b1ad6db5966abf24384e4d7cd75ec</md5file>
-<md5file name="fiscalyear.php">009650d067516d02bc9c60b0a052d42a</md5file>
-<md5file name="index.php">8e94b10fb8186808a8eb062d779f8d28</md5file>
-<md5file name="fiscalyear_info.php">076903b190acfb6b170eb90d8fd49429</md5file>
-<md5file name="importaccounts.php">356d580c6e44246f6f3d5b8e1836dae1</md5file>
-</dir>
-<dir name="/accountancy/supplier" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">9456dbab1e95eaeb225ecf3dcd7279eb</md5file>
-<md5file name="lines.php">2a20d41a59ec0e65e6b4b3965c14f0f2</md5file>
-<md5file name="index.php">eede74243020f191367de29c0d99152f</md5file>
-<md5file name="list.php">16b53a0f3754b77aa9518f33494c0d01</md5file>
-</dir>
-<dir name="/accountancy/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="html.formventilation.class.php">4263b103f7eaaa4e463077ab2f074a08</md5file>
-<md5file name="accountancysystem.class.php">0afeef5ccf212bb105402750080c0877</md5file>
-<md5file name="accountingaccount.class.php">122fb026779a4a168cf075f42cf83bc0</md5file>
-<md5file name="bookkeeping.class.php">c6f3505c1e7aa4da227a54879b0d84ca</md5file>
-</dir>
-<dir name="/accountancy/journal" >
-<md5file name="purchasesjournal.php">b019e434f1614515ba4f30fbbfc0d0cf</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="sellsjournal.php">7f32fdb8cd9febd23caa52257dc28a1a</md5file>
-<md5file name="bankjournal.php">7d1ccb1358afabbddb46c45d0b30585d</md5file>
-<md5file name="index.php">2d78040a3abd75948901284b3f558311</md5file>
-</dir>
-<dir name="/accountancy/bookkeeping" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="listbyyear.php">879588253d897872b19a2d2047467349</md5file>
-<md5file name="card.php">b57874e80855d3eb364bd8d156767e9a</md5file>
-<md5file name="list.php">0c22da9b6c6333683781ee5ce862ca64</md5file>
-<md5file name="balancebymonth.php">20db3cb2d80f0305be2472c077394769</md5file>
-</dir>
-<dir name="" >
-<md5file name="index.php">d0583459e8fdb6b0029245ee38c70429</md5file>
-</dir>
-<dir name="/livraison" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">d90ed26886d85da50db6557d9320fa1b</md5file>
-</dir>
-<dir name="/livraison/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="livraison.class.php">23752bba338ea1a8b3a230ca8179e4c3</md5file>
-</dir>
-<dir name="/projet" >
-<md5file name="ganttchart.inc.php">0d1749857d83ca714437ed891e35f046</md5file>
-</dir>
-<dir name="/projet/admin" >
-<md5file name="project_extrafields.php">ace625529635a30786e1f83d82bf09d4</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="project_task_extrafields.php">8a8adca33245aca45fa1400db7689102</md5file>
-<md5file name="project.php">07cd846e2933b5d191f672bd90921875</md5file>
-</dir>
-<dir name="/projet/stats" >
-<md5file name="index.php">44969a6487e6e551ee4ab6a3057e9c7f</md5file>
-</dir>
-<dir name="/projet/activity" >
-<md5file name="perday.php">27af3638e711cf213d2b7edc33f5bf80</md5file>
-<md5file name="perweek.php">82a86b991cb3bf4f791ae4d0d590c8b8</md5file>
-<md5file name="index.php">6bd38b6af505407d62c60a9eefdf208b</md5file>
-</dir>
-<dir name="/projet" >
-<md5file name="document.php">d69969e2a9166108538a95b086599544</md5file>
-<md5file name="card.php">740bf2ea7c400568aae6e3ebbb7efac2</md5file>
-</dir>
-<dir name="/projet/ajax" >
-<md5file name="projects.php">e9e895d857f4fadb5d169d98cecc4cb4</md5file>
-</dir>
-<dir name="/projet" >
-<md5file name="note.php">c9fa8f71196dbd4da6c319f00412a394</md5file>
-</dir>
-<dir name="/projet/tasks" >
-<md5file name="document.php">0529ddc77e8c681c33c47b9b7687e810</md5file>
-<md5file name="note.php">faa2eda13c5607ace72e34e9c0966a0c</md5file>
-<md5file name="contact.php">72ddc5bafe07d7b1963a002ff2638ce9</md5file>
-<md5file name="time.php">55292d144ee7e11471fbba2b249494ad</md5file>
-<md5file name="task.php">9e6bbdc99eed41d9480ff63f9c187e81</md5file>
-<md5file name="index.php">fc788306c40f210227d440befeb605d2</md5file>
-</dir>
-<dir name="/projet/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="projectstats.class.php">6b603e643ce203e1268c44f2560baece</md5file>
-<md5file name="task.class.php">495109ce3cd762f708dea35bff725ecf</md5file>
-<md5file name="project.class.php">a68a62a40bd64f627b6ee6a3f4aeef96</md5file>
-</dir>
-<dir name="/projet" >
-<md5file name="contact.php">b554b95843ce324153cf63af81c4f467</md5file>
-<md5file name="ganttview.php">49211ad04c8d6486b554f5dfa2549211</md5file>
-<md5file name="index.php">b029262dc429f54b44eaac3bb3673fb2</md5file>
-<md5file name="list.php">25cfef0428da4c37fdb47852f49bc1b2</md5file>
-<md5file name="element.php">199b29d1446f63ab1880745ec589933d</md5file>
-<md5file name="tasks.php">e2ae08bd4f83213f865545056ac6dd35</md5file>
-<md5file name="jsgantt_language.js.php">43cc87a6b84afe612af178e9c0945279</md5file>
-</dir>
-<dir name="/compta/deplacement/stats" >
-<md5file name="index.php">e5cd7d817cbfe8c2b5e4f92a892c2de7</md5file>
-</dir>
-<dir name="/compta/deplacement" >
-<md5file name="document.php">9d267f46db9b35ccdf464db22f7a8726</md5file>
-<md5file name="card.php">195a075744dcd8b1bd58f0cfc5cde946</md5file>
-</dir>
-<dir name="/compta/deplacement/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="deplacement.class.php">92b5beab6868b0cb7ba5529550d7b769</md5file>
-<md5file name="deplacementstats.class.php">ed84c415bafb8d11fbc3bd0dde0e5408</md5file>
-</dir>
-<dir name="/compta/deplacement" >
-<md5file name="index.php">81d7f7ae7f6178b08e71e8cf0033f0a8</md5file>
-<md5file name="info.php">1d8a8c14f623c3db37a02c7eccda33ec</md5file>
-<md5file name="list.php">d12c0159673d8d8114db46e34f6623e3</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="clients.php">602da82cec31cf5a062cedd8ffdb0d9d</md5file>
-</dir>
-<dir name="/compta/paiement" >
-<md5file name="avalider.php">83fa2b36decac5ac73128df2630dc60d</md5file>
-<md5file name="rapport.php">71eafd033fa192897bfee1000d8340b6</md5file>
-<md5file name="card.php">c8324df8cdd53f48c81f7b3806dea8bc</md5file>
-</dir>
-<dir name="/compta/paiement/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paiement.class.php">51b90418f6d0cd8efc0a5099c5f3f6de</md5file>
-</dir>
-<dir name="/compta/paiement/cheque" >
-<md5file name="card.php">4a171bb2d17569b4427873b3381ad814</md5file>
-</dir>
-<dir name="/compta/paiement/cheque/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="remisecheque.class.php">5f33d0fdd885d00af1ac8677b04af346</md5file>
-</dir>
-<dir name="/compta/paiement/cheque" >
-<md5file name="index.php">105834a4e145cd3717f34d795ed01677</md5file>
-<md5file name="list.php">c4e350405eac9404f23a9944a4c40553</md5file>
-</dir>
-<dir name="/compta/paiement" >
-<md5file name="index.php">8c7c756f1961be336a5783d4c841145c</md5file>
-<md5file name="info.php">543fe99f0aeb0e9aa7241f30fddffb16</md5file>
-<md5file name="list.php">e6f17c9ddc578856bf2fde5efc3fa2be</md5file>
-</dir>
-<dir name="/compta/prelevement" >
-<md5file name="demandes.php">6f745fb918c6b5d413a7de84c6e54521</md5file>
-<md5file name="card.php">cde44cfa63f262dac6e46ce47dde1f90</md5file>
-<md5file name="factures.php">905d2ef1ad71447712edfe2c690a2a8f</md5file>
-</dir>
-<dir name="/compta/prelevement/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="rejetprelevement.class.php">aa7d0bf9e395a97e107c9a76c89e307c</md5file>
-<md5file name="ligneprelevement.class.php">259760d5653ed342f1dfeb8d24750b47</md5file>
-<md5file name="bonprelevement.class.php">d895e0426e095eec95294e0d89917c85</md5file>
-</dir>
-<dir name="/compta/prelevement" >
-<md5file name="bons.php">465833cc227ccaddfe18697220f1c733</md5file>
-<md5file name="rejets.php">88460cb74a7b8cf8fb05a75432029df4</md5file>
-<md5file name="index.php">aca1b7c4b499be6cf7bd8821408814fe</md5file>
-<md5file name="create.php">d7eeeaf3fe46a5f427eb605b25802c56</md5file>
-<md5file name="stats.php">2a43f612f1f28c229bd6e9768baf8c27</md5file>
-<md5file name="list.php">158a0a9e9986d162cec4819ffef6b000</md5file>
-<md5file name="fiche-stat.php">a1033167badb7ecff1c5e71c21e0b7b1</md5file>
-<md5file name="fiche-rejet.php">74c7d3f5175296a3a243b76a7e6c640a</md5file>
-<md5file name="ligne.php">d014f101c786925b6d34dbaed4953c83</md5file>
-</dir>
-<dir name="/compta/payment_sc" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">2fdff73e41250121b1ab8849901e0cef</md5file>
-</dir>
-<dir name="/compta/sociales" >
-<md5file name="document.php">76270e34f90b10900c95fdc7dc7c8a74</md5file>
-</dir>
-<dir name="/compta/sociales/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="chargesociales.class.php">a7ca31c010b324794b265778be355e9d</md5file>
-<md5file name="paymentsocialcontribution.class.php">d749c37341f17446c14a0f236594bf1f</md5file>
-</dir>
-<dir name="/compta/sociales" >
-<md5file name="index.php">d04f79d8946d6b0168914e4f2d0cdf45</md5file>
-<md5file name="info.php">e40683c017da1b90fbef6b4df53a501a</md5file>
-<md5file name="charges.php">c387dade18e12f1195103e8756b75139</md5file>
-</dir>
-<dir name="/compta/stats" >
-<md5file name="cabyuser.php">737cea99171b10f164def53c9cac680c</md5file>
-<md5file name="cabyprodserv.php">dca3cda5fc2c11c6ea4fe8b733407371</md5file>
-<md5file name="index.php">c04b240903598f5edf1df7f263c05116</md5file>
-<md5file name="casoc.php">f6cd6e4db0740ba9dcbc564de7e2dbc8</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="ajaxpayment.php">19ff8a52a9056fbaf0fcf50bd50ebe48</md5file>
-<md5file name="paiement.php">3fbaf85b4c2e449d3d15b159bc166105</md5file>
-</dir>
-<dir name="/compta/bank" >
-<md5file name="annuel.php">39c29f1dc8e0f1d52719e3e723bc5c30</md5file>
-<md5file name="treso.php">77a8e7f395a22f09a1b776c2386ade99</md5file>
-<md5file name="card.php">3cb438c619f489160774b01f0d33d9d5</md5file>
-<md5file name="bilan.php">6fe5e34cc37004b4342377afa27fe78e</md5file>
-<md5file name="account.php">5dcc8f604b02e48a19d4938111200b60</md5file>
-</dir>
-<dir name="/compta/bank/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="account.class.php">a4d82c22f078008d2aab3964af135f87</md5file>
-<md5file name="bankcateg.class.php">1dc3d6a1dd909a8a58fe8eca47ead5ac</md5file>
-</dir>
-<dir name="/compta/bank" >
-<md5file name="releve.php">87f5ed0a1e6d7d72a9347cfd91e3c6ca</md5file>
-<md5file name="categ.php">a9c4f3b8c9d9d714e021836b5d7b2f52</md5file>
-<md5file name="search.php">60bdcaae8923681fb2920d8f926f2b98</md5file>
-<md5file name="index.php">1f88ec9bea577d80683b7e33d5edd1c0</md5file>
-<md5file name="budget.php">59cc5ce648da64f713581c8952a82fe0</md5file>
-<md5file name="info.php">abcdf41603da0d617bee025c713adb41</md5file>
-<md5file name="graph.php">5a226ae63892e8b2488ef6bba059d308</md5file>
-<md5file name="rappro.php">4a825f9bc0b4b91965e9b28f9e9de5f2</md5file>
-<md5file name="virement.php">40762769c56a375a21683e8a96a8b814</md5file>
-<md5file name="ligne.php">0b033f5995404a15bc6e106289183507</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="paiement_charge.php">0e379c10da4f2f10c8a1346eec194124</md5file>
-</dir>
-<dir name="/compta/charges" >
-<md5file name="index.php">995ec6d6e1a5a9482c4e2b89a0d2f881</md5file>
-</dir>
-<dir name="/compta/salaries" >
-<md5file name="document.php">a203d87b7fe0a7fff96f2938a0c194cd</md5file>
-<md5file name="card.php">7f6ecb26a9a3594aba4ef34177a0028d</md5file>
-</dir>
-<dir name="/compta/salaries/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paymentsalary.class.php">ba0f6e643c21f0759cb555cc9d81ab66</md5file>
-</dir>
-<dir name="/compta/salaries" >
-<md5file name="index.php">fd70155d1aebd2f3e85de088440ef659</md5file>
-<md5file name="info.php">7b01b1026f28ec7458c2a4d48b261d26</md5file>
-</dir>
-<dir name="/compta/journal" >
-<md5file name="purchasesjournal.php">e70a1c6f58e07f1ba5fa83f488aa9009</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="sellsjournal.php">0d897010fc85f2f0f42e9a606217cd38</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="hrm.php">7e19a2437daebd45de069393fbb6e844</md5file>
-</dir>
-<dir name="/compta/facture" >
-<md5file name="prelevement.php">24238dbdbf16729d45fe608f6494151a</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/compta/facture/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">3a8904966a2f450f621c5267098f7360</md5file>
-</dir>
-<dir name="/compta/facture/admin" >
-<md5file name="facture_cust_extrafields.php">5f6fcd5535f2233dc3dc9fe6312f1fc3</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="facturedet_cust_extrafields.php">9d7603b11033ad6fbcb3bbc46d5503d8</md5file>
-</dir>
-<dir name="/compta/facture/stats" >
-<md5file name="index.php">9568715bc1f4d7aa42744b4096afb922</md5file>
-</dir>
-<dir name="/compta/facture" >
-<md5file name="document.php">a95d18dda6cd01128bc3a96edc463191</md5file>
-<md5file name="note.php">cf7beba0674c611eca3eb40103a9d56d</md5file>
-<md5file name="mergepdftool.php">f2ccb38e0d2f63eae9733c604a4862b0</md5file>
-</dir>
-<dir name="/compta/facture/class" >
-<md5file name="paymentterm.class.php">be4909eb830f52517bb34572822210b6</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="facture-rec.class.php">2a2702bd2167fd28271eb4eabca6363c</md5file>
-<md5file name="facture.class.php">fd2dd2fbd7f099628630db64aca7e94f</md5file>
-<md5file name="facturestats.class.php">eac5c0f76e5ff1988532c66b922e800f</md5file>
-<md5file name="api_invoice.class.php">26e616b72a49ae4b326a093bd0713303</md5file>
-</dir>
-<dir name="/compta/facture" >
-<md5file name="fiche-rec.php">32e6a6b4b2bc4a78d07dfdcee485c09b</md5file>
-<md5file name="contact.php">289aeb68be3c5ff2a4cdd57a64257b8e</md5file>
-<md5file name="info.php">31431bfb5d4f361b35887e63a0099655</md5file>
-<md5file name="list.php">d4e648a77c85398d52bf5915e981484e</md5file>
-<md5file name="apercu.php">3e8c8ff5959ed24ad35c169286978b20</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="index.php">516f6715e3e5d0e96d09ffe85cf3204d</md5file>
-<md5file name="recap-compta.php">14182aeabccd7c3a761d93d1564a27f4</md5file>
-</dir>
-<dir name="/compta/resultat" >
-<md5file name="clientfourn.php">0ba364012068975254ac02cf15ccd1b2</md5file>
-<md5file name="index.php">4045e0030818c05ec539a2bd6f3a6d17</md5file>
-</dir>
-<dir name="/compta" >
-<md5file name="facture.php">3042db4b42f2e098badf2c40163287d5</md5file>
-</dir>
-<dir name="/compta/ventilation" >
-<md5file name="card.php">d6d047f9389cde6f11b9175ffda432ac</md5file>
-</dir>
-<dir name="/compta/ventilation/fournisseur" >
-<md5file name="card.php">a60005bc1ec9d7d32bd3f20f41d3a5ad</md5file>
-<md5file name="list.php">1351e4de8c5ad72c9a1c29c2d0ac9e19</md5file>
-</dir>
-<dir name="/compta/ventilation" >
-<md5file name="list.php">cb26417ed98d172fa1fd331e1985d799</md5file>
-</dir>
-<dir name="/compta/tva" >
-<md5file name="clients.php">9bdff8a4621202d256b03029cdb5bf29</md5file>
-<md5file name="quadri_detail.php">946760ff06abcff5d8863b1e782893f5</md5file>
-<md5file name="card.php">d77afff33da4f512b0fb46d1be520cd0</md5file>
-</dir>
-<dir name="/compta/tva/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="tva.class.php">7efad8914a2820187193583cd1e72f85</md5file>
-</dir>
-<dir name="/compta/tva" >
-<md5file name="quadri.php">ea932a69d0162b3473db8257d8066569</md5file>
-<md5file name="index.php">077e5ba7b08bcccf15dd7278d4f86910</md5file>
-<md5file name="reglement.php">f66a1f1f8d46f3d0a72dd22dde61e05f</md5file>
-<md5file name="quarter_report.php">877b795a5f8b86fc318fb7a57176d69c</md5file>
-</dir>
-<dir name="/compta/localtax" >
-<md5file name="clients.php">793e1a0fa37a44aee8041f15d41f6bea</md5file>
-<md5file name="quadri_detail.php">2467bc6197f1066da440342477aacf42</md5file>
-<md5file name="card.php">fc9bde4001ef44e613b445c76a5a806c</md5file>
-</dir>
-<dir name="/compta/localtax/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="localtax.class.php">1a9d29ac8baf9b71986185e8d6bd15b0</md5file>
-</dir>
-<dir name="/compta/localtax" >
-<md5file name="index.php">a8238f46912020ddd0082c86c6bbe0c2</md5file>
-<md5file name="reglement.php">af528677086b2c26806ac47af95d9d9d</md5file>
-</dir>
-<dir name="" >
-<md5file name="main.inc.php">4d8b4f0adacfa91ce36acd7ae5b7557b</md5file>
-</dir>
-<dir name="/paybox" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/paybox/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paybox.php">59e41d25b4e9f234997a985ced825afc</md5file>
-</dir>
-<dir name="/paybox/lib" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paybox.lib.php">71e5d7118df1c74c731731d60a8da22a</md5file>
-</dir>
-<dir name="/paybox/img" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_paybox.png">006da78b11f7babb89e930b835695263</md5file>
-</dir>
-<dir name="/mailmanspip" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/mailmanspip/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="mailmanspip.class.php">65538ddc6ba20338f68de9c0aaff0fc3</md5file>
-</dir>
-<dir name="" >
-<md5file name="master.inc.php">318ba51c0457714cf1b5861400a96e22</md5file>
-</dir>
-<dir name="/fourn/paiement" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">8be23d776c1495d2c25270d31f043b15</md5file>
-<md5file name="info.php">fde1dac27ff95323136138883a8cb086</md5file>
-</dir>
-<dir name="/fourn" >
-<md5file name="card.php">bbe63bc9761891dd1f47f5639ac8fd44</md5file>
-</dir>
-<dir name="/fourn/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="getSupplierPrices.php">6154832a9543ef1c71df2880916850af</md5file>
-</dir>
-<dir name="/fourn/product" >
-<md5file name="list.php">722a25744063ea81a6d9be2df501a47e</md5file>
-</dir>
-<dir name="/fourn/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fournisseur.class.php">33164d88351d201cc651f7142656c3ea</md5file>
-<md5file name="paiementfourn.class.php">759762a86ea42322a44b7eadd4b76959</md5file>
-<md5file name="fournisseur.commande.dispatch.class.php">6c456bf952ac5c6889d0360ae3d327a1</md5file>
-<md5file name="fournisseur.commande.class.php">188746369ab37b18b1f84b20aced9f0d</md5file>
-<md5file name="fournisseur.product.class.php">80a28b7d54cfb242e531baebbb30e4fb</md5file>
-<md5file name="fournisseur.facture.class.php">6efb95c81d5c8e640155ad63842987e0</md5file>
-</dir>
-<dir name="/fourn" >
-<md5file name="recap-fourn.php">fe62c00b682dd677dbca4764d5f0fe97</md5file>
-<md5file name="contact.php">646433b89ab65da2f538fb1333e3f21c</md5file>
-</dir>
-<dir name="/fourn/facture" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/fourn/facture/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">b618195d04bfb69c787fd538c72642c7</md5file>
-</dir>
-<dir name="/fourn/facture" >
-<md5file name="document.php">b6fd5cc801d681b05256bf8b413c9786</md5file>
-<md5file name="card.php">104960714a8b404303b3436ef291f2d1</md5file>
-<md5file name="paiement.php">1d56c1cff5f6f94c0fac9cf48fe819ba</md5file>
-<md5file name="note.php">2b061d246bb5f2342b9867c346f3f1a7</md5file>
-<md5file name="contact.php">d592551b67e9dd797f7a36a1b257684b</md5file>
-<md5file name="info.php">204000f10fb031ceb45970d4b4996fca</md5file>
-<md5file name="list.php">67269b44cffb3cf2a270dbabe6fef510</md5file>
-<md5file name="impayees.php">2accac2e7486bca7a2d57f646974d54e</md5file>
-</dir>
-<dir name="/fourn" >
-<md5file name="index.php">e2605c19e2029efa999dc98306e5a834</md5file>
-<md5file name="list.php">a56305ab485005ec0df66969dc531d53</md5file>
-</dir>
-<dir name="/fourn/commande" >
-<md5file name="history.php">76698169fea8c817165cec07292a4d60</md5file>
-</dir>
-<dir name="/fourn/commande/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">593c455e4bd7684c7ef75dc97b8e48a7</md5file>
-</dir>
-<dir name="/fourn/commande" >
-<md5file name="document.php">ea1a3bd45013d291cafdce135ebbd13c</md5file>
-<md5file name="card.php">f9a7c3d80ef15ebdb16b9f9a4289eaed</md5file>
-<md5file name="note.php">221d0b581479c434f039e58da4718a8d</md5file>
-<md5file name="contact.php">a6f5b10b14e766e788351b506b6f6024</md5file>
-<md5file name="dispatch.php">cd10645e90733c7d081f7bedaa56b891</md5file>
-<md5file name="index.php">9cbf5490111bcd1d06d0f311c624f40a</md5file>
-<md5file name="orderstoinvoice.php">827c15aadfe78fdc44f51a5820d18693</md5file>
-<md5file name="list.php">b31ded35f3b4a18458c7233b20a5f0ab</md5file>
-</dir>
-<dir name="/margin" >
-<md5file name="agentMargins.php">79fb102cf00e5bf2a76cf1330fb51577</md5file>
-</dir>
-<dir name="/margin/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="margin.php">191ad6a413e35342ca7cd3460dd9f31a</md5file>
-</dir>
-<dir name="/margin/tabs" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="thirdpartyMargins.php">920415a8d70425c1c0476200edc745b3</md5file>
-<md5file name="productMargins.php">616dcb2aa65aabb125304d44c6efe355</md5file>
-</dir>
-<dir name="/margin" >
-<md5file name="index.php">3f5993acb1427876c4ca8913cddc9174</md5file>
-</dir>
-<dir name="/margin/lib" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="margins.lib.php">07d2097f5a71a50b264d0b8454c2280d</md5file>
-</dir>
-<dir name="/margin" >
-<md5file name="customerMargins.php">344eb06fc61a81af1c48511d600085bc</md5file>
-<md5file name="productMargins.php">fdcdabe7131abe3f84495b7b4ce2bb48</md5file>
-</dir>
-<dir name="/user" >
-<md5file name="agenda_extsites.php">5172e014803abc5035329de011afd2b3</md5file>
-</dir>
-<dir name="/user/group" >
-<md5file name="perms.php">bef639ba5d15fbe93aa7df26bf6c3a70</md5file>
-<md5file name="card.php">e44e91ef5244be2cdfb621378e0540f2</md5file>
-<md5file name="ldap.php">d00dcd6a42cd0d91cbd5639c56a4b6a7</md5file>
-<md5file name="index.php">5d4180ac81224afbea66b0b2d6d7d5d7</md5file>
-</dir>
-<dir name="/user" >
-<md5file name="passwordforgotten.php">7ab5486f4cec78b1c4d93a1df0d83b51</md5file>
-</dir>
-<dir name="/user/admin" >
-<md5file name="group_extrafields.php">8663323ebadcaf9b966b5232836729ac</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="user_extrafields.php">4fed232f7de5c37b43e0d4cd56c42051</md5file>
-</dir>
-<dir name="/user" >
-<md5file name="logout.php">f47f735ec8627b7b3e9ce6a5e1643d4c</md5file>
-<md5file name="perms.php">79e09419acc819e70f82f56d7fa81d20</md5file>
-<md5file name="document.php">605bb5fb9f548a1cfb766c12c98aa303</md5file>
-<md5file name="card.php">d5b503dc10a91fc2867f11b806e43aee</md5file>
-<md5file name="note.php">0b0532af9e3f441fe8f2e530df0e8b60</md5file>
-<md5file name="ldap.php">61bcd0fc159ba4ac9b4ca405006a458e</md5file>
-</dir>
-<dir name="/user/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="usergroup.class.php">bcfa3b276dd79437d1d60139fe51de01</md5file>
-<md5file name="user.class.php">b38990d47a4975ee30ed0e3af4a378e3</md5file>
-</dir>
-<dir name="/user" >
-<md5file name="index.php">f9cfd60be746eaea8b3e69fc3fe9fee5</md5file>
-<md5file name="param_ihm.php">2068f6bb040e517d593f0e5607b8724a</md5file>
-<md5file name="info.php">e9075781de163cf107fb3202edb3e002</md5file>
-<md5file name="hierarchy.php">5fbdf018aa95b4d6fba8a6520c1395cc</md5file>
-<md5file name="home.php">6a6c8a4f2f8305f324705e111f5ab746</md5file>
-<md5file name="clicktodial.php">9cac9f75f05ba54c2255f7c789a5ab0e</md5file>
-</dir>
-<dir name="/langs/es_PR" >
-<md5file name="bills.lang">357849a83e3bd4b80b773283f4376a88</md5file>
-<md5file name="admin.lang">ff5a2f73aa7d542ce30baafe36da69b7</md5file>
-<md5file name="companies.lang">2dd355941009bb108ad48bfdc68955de</md5file>
-<md5file name="compta.lang">207233d73666cd6d8fe829eef44420fd</md5file>
-<md5file name="propal.lang">648f0070a72520023118ef9d7d26500e</md5file>
-<md5file name="main.lang">a6eeebb304bbe571ffbab0db1d030569</md5file>
-</dir>
-<dir name="/langs/fa_IR" >
-<md5file name="projects.lang">f6145207c408075fd530e364b06a805d</md5file>
-<md5file name="cashdesk.lang">e531ddc71cd65c765c78bcadbf10f8d7</md5file>
-<md5file name="workflow.lang">ca8137cb50689abf0c3bebe34978dcf7</md5file>
-<md5file name="bills.lang">f924847ab85674ba3200ca27277e0030</md5file>
-<md5file name="orders.lang">db7986081e563555bbb45d35b1dfc823</md5file>
-<md5file name="domains.lang">458d70e686a207a21618c43bb1b9779a</md5file>
-<md5file name="admin.lang">12fe6ef54baa77f95b323f66280726d9</md5file>
-<md5file name="withdrawals.lang">59ddd81ed9bf99d543f6f3aecb613f99</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">23b68fe48b368fc328f5dadcd75fdfe1</md5file>
-<md5file name="members.lang">6b1640bc51b7f7eb47b7502f0aaf0d2c</md5file>
-<md5file name="ecm.lang">23f198c26ee64d43c1673947c8865329</md5file>
-<md5file name="link.lang">d425b192e4e4f644e3233a2d63ab5f61</md5file>
-<md5file name="stocks.lang">ef10d5d01e0c99da899694a920063a6b</md5file>
-<md5file name="products.lang">2aaee86d73909262c225b9360c1671c5</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">ec0f990c4626353903979ab05aefc6a3</md5file>
-<md5file name="agenda.lang">d9bd6150df07f9517e4ca5056dbe663f</md5file>
-<md5file name="help.lang">d3328f22bef875e75fcc41b404ce8460</md5file>
-<md5file name="holiday.lang">269be72b4c109b1d9407168cc255a548</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">95bb2af8fabef4d78ebdf2a5a9799ecb</md5file>
-<md5file name="paybox.lang">8fa3145942e5d0df587b19b538a59e2b</md5file>
-<md5file name="ldap.lang">c3fb35dd0fefe93bbf0dfd8976709bb7</md5file>
-<md5file name="users.lang">1ee548ff699369a2ef3328d8c3010048</md5file>
-<md5file name="companies.lang">8349c7c6bc6c2d51c9d617d196588c41</md5file>
-<md5file name="margins.lang">d51def48233e07c836e1c7a673186824</md5file>
-<md5file name="ftp.lang">5a7e53549b13ba69bb551e3d13785e3d</md5file>
-<md5file name="exports.lang">8a0ccbf9bbd36a4cc3aeb30517c48280</md5file>
-<md5file name="paypal.lang">b7f38fe9df82f9bfdeb39d490bcf2273</md5file>
-<md5file name="cron.lang">c5d8a435b760308bd0c43e3494dea231</md5file>
-<md5file name="interventions.lang">b154606cfec9ae71a3084379c3f52643</md5file>
-<md5file name="errors.lang">2103918d3f7bbc6b25c9ebe75e5ba5bb</md5file>
-<md5file name="compta.lang">8383b83413ec5080325c0104121cc34c</md5file>
-<md5file name="suppliers.lang">be603b1e11232e8e4df3956712576964</md5file>
-<md5file name="opensurvey.lang">afab86bd75994dd422cde6c39712e684</md5file>
-<md5file name="donations.lang">3324c82b9c0e239b743efceb0b1ee4a1</md5file>
-<md5file name="contracts.lang">6d984b6497a4521ab43b53f8ffa97239</md5file>
-<md5file name="deliveries.lang">af2c055b31358dcfbcaff19b8f32d741</md5file>
-<md5file name="mailmanspip.lang">0b811b8a0f1113a872111a69e771d294</md5file>
-<md5file name="install.lang">f0a5af4ef3fcf089d999c72424dd1534</md5file>
-<md5file name="propal.lang">e1514692701903c4fa8ab6f93685fe9a</md5file>
-<md5file name="main.lang">7c5ca268a2ea7a6376036f2c81f5b10f</md5file>
-<md5file name="languages.lang">b1e3e3f8550be02bc85065afb34f2465</md5file>
-<md5file name="bookmarks.lang">aa3dd95196d0ec83718e74c22d0a0da3</md5file>
-<md5file name="sms.lang">e2e3cd92d8221808b6348ea0dce50716</md5file>
-<md5file name="dict.lang">2b89db2c940374d7c69527633eb17a27</md5file>
-<md5file name="mails.lang">186fcdda038c22d40f7457eb1381e256</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">1a323c8a650df021abc1b586298f18ef</md5file>
-<md5file name="commercial.lang">cded91562e6513c973abed21d413cd1d</md5file>
-<md5file name="salaries.lang">55f29464b755eabef4cf655705d4e4fc</md5file>
-<md5file name="trips.lang">d7de9e65df06622427243a6b3ed53cd4</md5file>
-<md5file name="sendings.lang">c093fba925641be12ad8f06bb542160a</md5file>
-<md5file name="accountancy.lang">5d05efac98c6fd3106f56295ce0b8673</md5file>
-<md5file name="externalsite.lang">ed3b811dbf2f5f0da999aac45470a2eb</md5file>
-</dir>
-<dir name="/langs/ca_ES" >
-<md5file name="projects.lang">d7d541404e019a6d8f45d1347bef2be7</md5file>
-<md5file name="cashdesk.lang">36d8c10a2ce5713bc959bebc6b9bb3af</md5file>
-<md5file name="workflow.lang">55323f24685f41d39d6a5d297e3654db</md5file>
-<md5file name="bills.lang">e5247dca22fac3bb18e72e0171a09447</md5file>
-<md5file name="orders.lang">762641475619347539e2028a53f2ddf9</md5file>
-<md5file name="admin.lang">aadfd180c094b155f2c8ecedf9b7d377</md5file>
-<md5file name="withdrawals.lang">a3e9bc5dfe51c558cc8277d44fd5c4d4</md5file>
-<md5file name="incoterm.lang">c7e95ae701ec540f03a566203de781b3</md5file>
-<md5file name="loan.lang">d67ca33509c6f0eabbd6c661a27ab0e2</md5file>
-<md5file name="boxes.lang">c19d107b0434906fbc0b459f61f85117</md5file>
-<md5file name="members.lang">b273aa429a16fe1379be33876a4d49f7</md5file>
-<md5file name="ecm.lang">8869a3a7b2a620a7621d4870c57aef75</md5file>
-<md5file name="link.lang">1222fe864b75c9d423009dbdad938cdf</md5file>
-<md5file name="stocks.lang">9939c5fec9087bfdc82d8dccb2c2f64d</md5file>
-<md5file name="products.lang">d4bed0644268bf6cd99128f64db17e9a</md5file>
-<md5file name="printing.lang">81ed7b9e30bf240d51d7e60c65e169d8</md5file>
-<md5file name="banks.lang">1a1e47204edfd7a39a48bc94a6d87039</md5file>
-<md5file name="agenda.lang">94cd6326697d1468356fd7860c279f39</md5file>
-<md5file name="help.lang">abdc5b264864f9054c2bd3582aa7f290</md5file>
-<md5file name="holiday.lang">d9c27d2d19632b11e7b5df247d1cb5ce</md5file>
-<md5file name="productbatch.lang">d11b836dcf659c52b30c12fe751664c2</md5file>
-<md5file name="resource.lang">3b21f916c1cc442741493663d4d870f8</md5file>
-<md5file name="categories.lang">8d6ef3890b3855e9c9901f905906f84a</md5file>
-<md5file name="paybox.lang">e8df1b36eeaf2d3020a71b0e273a4d99</md5file>
-<md5file name="ldap.lang">97af8c6ef82a0f244fc815e6e16ccf90</md5file>
-<md5file name="users.lang">90ec5a83c874481c4db7a861ea540e62</md5file>
-<md5file name="companies.lang">123e1ced012cf5ca86c9b7a4d713bed6</md5file>
-<md5file name="margins.lang">fbbf6dd97870502f3b527a7855cc22fd</md5file>
-<md5file name="ftp.lang">673b7b9a03cff6437a53f372059947bd</md5file>
-<md5file name="exports.lang">b8636271987e671c88b7a23c312319dc</md5file>
-<md5file name="paypal.lang">8ff03a197fb775293900b1652cbc2cae</md5file>
-<md5file name="cron.lang">bbcc88993e093b880a682371243cc500</md5file>
-<md5file name="interventions.lang">7b3c1047d31736f0b995520bf5c770ec</md5file>
-<md5file name="errors.lang">d74e66986a63465cfd73af9d5dd1a180</md5file>
-<md5file name="compta.lang">c2855a7d06669f944c7aaca53532b7d8</md5file>
-<md5file name="suppliers.lang">10d1641217a535f93ec6a25fb693b58f</md5file>
-<md5file name="opensurvey.lang">72edeb3570c0c46201f53a9ecafea7cf</md5file>
-<md5file name="donations.lang">39b1a98ee31c34a9a67fd7f2eccf931d</md5file>
-<md5file name="contracts.lang">f3b0f3b7f9597a5081dd6901be2eef39</md5file>
-<md5file name="deliveries.lang">c1da4b8a0934373f032daa2da245a23b</md5file>
-<md5file name="mailmanspip.lang">9bc9627697f6507eaac340ce462ea48f</md5file>
-<md5file name="install.lang">7d6fa21f3d0ab0a5b4b676a64fe44c6a</md5file>
-<md5file name="propal.lang">fb0d8c3726d85a9e032c4aba68fe5ca7</md5file>
-<md5file name="main.lang">312ed461e418e5e8b3e152dd2227bbae</md5file>
-<md5file name="languages.lang">3dfd632c14282d44c6d202e30378822c</md5file>
-<md5file name="bookmarks.lang">a77857a410bf6a20d1bc65d57df426e3</md5file>
-<md5file name="sms.lang">45bc4e783f1c8f3b4cc8887ff320ac8a</md5file>
-<md5file name="dict.lang">02140c8aab60d378c25d218f29d4fd51</md5file>
-<md5file name="mails.lang">6a019476090e0d2e7e18ff0cb90d8244</md5file>
-<md5file name="printipp.lang">a9e2cc6d99ccff9c1f8944d41f09a4ec</md5file>
-<md5file name="other.lang">344d119920534915d078b0bcf8139e6c</md5file>
-<md5file name="commercial.lang">537f4288b80ea71ac01cd85436796b2b</md5file>
-<md5file name="salaries.lang">5a39128e50a6a619cab4a84ed21fb5b0</md5file>
-<md5file name="trips.lang">9bdc51515920cae4374eecfd6037275a</md5file>
-<md5file name="sendings.lang">a2da3a94a599ef497665bb9273f94082</md5file>
-<md5file name="accountancy.lang">a81beb34507c2da511e5cd5783f2d2b3</md5file>
-<md5file name="externalsite.lang">1fb6c4f678f781062defcb85377e1223</md5file>
-</dir>
-<dir name="/langs/en_IN" >
-<md5file name="bills.lang">503179eef2a75e444e6ed540ab5816af</md5file>
-<md5file name="admin.lang">3a63b5ca883378d2e5b3ffc0bd8367ba</md5file>
-<md5file name="boxes.lang">329a3456692fb25e9ddd96dba6698739</md5file>
-<md5file name="products.lang">cf2e582534edc6a59ece7d22c939c00c</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="compta.lang">378e17fcf077672377ccbeef64dad311</md5file>
-<md5file name="propal.lang">da1eb7c39da28b862a798f37efa7ee43</md5file>
-<md5file name="main.lang">b2ee3e61485fdeb685fc7f73bf802b23</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="other.lang">dd8e45a37c5ef0fc6089df59605c284e</md5file>
-<md5file name="accountancy.lang">db59948d8443a30f976ef562646c108e</md5file>
-</dir>
-<dir name="/langs/sw_SW" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">34c7fde492170f80fe8e0e6434f3eb0b</md5file>
-<md5file name="languages.lang">829a72b83190364f8f94374443eea9fa</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/sk_SK" >
-<md5file name="projects.lang">d6c2e5a1d98c4af9f39c3e6f602f9f65</md5file>
-<md5file name="cashdesk.lang">737685ba123e361bbd63da12001d1853</md5file>
-<md5file name="workflow.lang">ead226130a7b08a13a2aeabf710b3b7b</md5file>
-<md5file name="bills.lang">2a441d2cb8444b1051bf199845319bfc</md5file>
-<md5file name="orders.lang">2e6a497a7e9cc16c543c8691b7505ce8</md5file>
-<md5file name="admin.lang">a39f58718f334dc2bae68db45ff92b87</md5file>
-<md5file name="withdrawals.lang">19c4c6055000b1d4fe6f5735d4c344c2</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">840f7c27d3d7920e11ef771581c42ea1</md5file>
-<md5file name="members.lang">255944687f37fefd684d3ec9d2fbb0d8</md5file>
-<md5file name="ecm.lang">9e6b10b82ff6650b119aebde1eb1e0da</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">045853f5d4a94bb75d809d8355dab2b6</md5file>
-<md5file name="products.lang">0fcff1379b65914e20e00b24b81a5e6b</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">e6737bc70917737b05e2b3cc3e87cee0</md5file>
-<md5file name="agenda.lang">a8853724a7797b14ab7a125c5a64aa3d</md5file>
-<md5file name="help.lang">30c6a2ac8f5dc2c78135a1d2d958c7d3</md5file>
-<md5file name="holiday.lang">846d37ac463e033347b10ce9c69184e6</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">483de5a7392121b04ca4b28d9629bce0</md5file>
-<md5file name="paybox.lang">9aa8f16badc4733edd5b5d1b099e7c21</md5file>
-<md5file name="ldap.lang">a1314605a33f143e8730909f6688403c</md5file>
-<md5file name="users.lang">eb84b44b99e2dab255db18f924ed970b</md5file>
-<md5file name="companies.lang">f59114c9b51282592f8c26e304872d54</md5file>
-<md5file name="margins.lang">f1d4b49dc349f942ecce7845d2bb5562</md5file>
-<md5file name="ftp.lang">34e7dd73d29e8efc0d0a013026575768</md5file>
-<md5file name="exports.lang">4d1cb0d2dde73ab7da101afb1eba3f55</md5file>
-<md5file name="paypal.lang">d819c152ecb177c120f1e3c9eaabc2c6</md5file>
-<md5file name="cron.lang">cc6c17551a0b45c91fc5fc79f276258e</md5file>
-<md5file name="interventions.lang">832cb306580ca6ce4e267ac8892c8732</md5file>
-<md5file name="errors.lang">9ed685e1553ee8262bb9cf750db98968</md5file>
-<md5file name="compta.lang">8a4585aaed5ab770db248832f2e1a7b5</md5file>
-<md5file name="suppliers.lang">802cd3b09bda10a75bbaf7f4597f9364</md5file>
-<md5file name="opensurvey.lang">31e4db724dddc41b42b165ed8c66f3a5</md5file>
-<md5file name="donations.lang">e80b6464c4a540b59ab03e8b66369968</md5file>
-<md5file name="contracts.lang">11851279ded53a68d299e1dd00c0b7dd</md5file>
-<md5file name="deliveries.lang">c6aa5d300ad94789a9f2c4cabc6cd8de</md5file>
-<md5file name="mailmanspip.lang">f5e9da89cf45e535117232b359317405</md5file>
-<md5file name="install.lang">c07ed48d4b65bab104ce0c4dc1cde684</md5file>
-<md5file name="propal.lang">4b57bd5427c18abceb5c20abd89f5ba9</md5file>
-<md5file name="main.lang">e70293904baa38c90c8be8ca5aa447b0</md5file>
-<md5file name="languages.lang">06eebf61b89a60cd11340a036f47f3cd</md5file>
-<md5file name="bookmarks.lang">1d7a55d13ebc889af056ef71120d26ec</md5file>
-<md5file name="sms.lang">119d9afb003f18c3adbfa0f2cad74211</md5file>
-<md5file name="dict.lang">b99f23c57218db693329dea5e53bdaca</md5file>
-<md5file name="mails.lang">966183e32332c7b7dff8d49b850fadbb</md5file>
-<md5file name="printipp.lang">d7f5ec81233132fc3a20c1017759ef79</md5file>
-<md5file name="other.lang">d783741a8e2aaf7c520dad108d7adb86</md5file>
-<md5file name="commercial.lang">b4c45bf3fa493d056d9bcbba3eb94e45</md5file>
-<md5file name="salaries.lang">bd3718cc7fbf6dc1b46753b2a07892bf</md5file>
-<md5file name="trips.lang">9d370bdd2d27879fbffdf88d5b937e80</md5file>
-<md5file name="sendings.lang">7d428fe710ba23ac644fbeae1e05174e</md5file>
-<md5file name="accountancy.lang">06ff7a812c4416c03336b3d0ff683da9</md5file>
-<md5file name="externalsite.lang">cdfa3838283c176556fd986e1d077a37</md5file>
-</dir>
-<dir name="/langs/lv_LV" >
-<md5file name="projects.lang">63dc3d49dac194089653e65425d6e5d5</md5file>
-<md5file name="cashdesk.lang">c9310d0a5a4f7e1f6b85201c0dc2fc5e</md5file>
-<md5file name="workflow.lang">6e04edde5694fc8e6bbb47aa579d974f</md5file>
-<md5file name="bills.lang">0ff8f5b9e25ca077b7d7d698b2e76e3e</md5file>
-<md5file name="orders.lang">97157f5de97d427dad060de635f0cbb2</md5file>
-<md5file name="admin.lang">b1dd4cd2ca514afb48faf71803fb072b</md5file>
-<md5file name="withdrawals.lang">74a51ee9815a4e81828f00e102f2b977</md5file>
-<md5file name="incoterm.lang">0c1d539dd0e536ab43cab029104330a2</md5file>
-<md5file name="loan.lang">f4edcec9ef405af2798f27a4d7902e12</md5file>
-<md5file name="boxes.lang">f70756497c931aadd89edbe485e88fb7</md5file>
-<md5file name="members.lang">f5e8ae5dcbf8191e1830afe13c85f33d</md5file>
-<md5file name="ecm.lang">dc628590b54606da6a6d3510ea4c94d1</md5file>
-<md5file name="link.lang">1f81e0757051db526d536d732ef22e3a</md5file>
-<md5file name="stocks.lang">fb4f2e0c1a0a003c40b83cec58eb358d</md5file>
-<md5file name="products.lang">eba7f7e57d85ab19a005e825dd7779c0</md5file>
-<md5file name="printing.lang">236eb01d61d0a87dc150f17fdd070f65</md5file>
-<md5file name="banks.lang">df71b03d06e518df446ee6e9792dcf89</md5file>
-<md5file name="agenda.lang">1402d10037a08d56070eee0ebf921e4d</md5file>
-<md5file name="help.lang">f8e9d0e2f7ca86f855a1fe6a39eab4d1</md5file>
-<md5file name="holiday.lang">25d873287aec9a21451e9717306db54f</md5file>
-<md5file name="productbatch.lang">1461952a71c3b0dab73956e09db90725</md5file>
-<md5file name="resource.lang">7a75cd5ac5590263657b0fe81c2e9686</md5file>
-<md5file name="categories.lang">742a6fcd6d5322ea47f1f7c8ecf85bc3</md5file>
-<md5file name="paybox.lang">1a7bfdc52688934752339f4d77e7e84e</md5file>
-<md5file name="ldap.lang">4bfee5904f91bea7f89e69b65d84edef</md5file>
-<md5file name="users.lang">41880d289bea521ebd8f24215e6d5f07</md5file>
-<md5file name="companies.lang">577c8ffc2f6319016ce9d416e7929d50</md5file>
-<md5file name="margins.lang">aaaf43f06ec3b56fa2ce44165d8b2227</md5file>
-<md5file name="ftp.lang">e775cffe814bc94a4328cd886366ffe2</md5file>
-<md5file name="exports.lang">87c46b335353a6fc640ae4c902b7f278</md5file>
-<md5file name="paypal.lang">7f1cf10b121b601826c8160b97d9201a</md5file>
-<md5file name="cron.lang">18c683d449cb983a0199f72f41bfa394</md5file>
-<md5file name="interventions.lang">511bf9b42503b99cc5df0cb7b229a287</md5file>
-<md5file name="errors.lang">610f3c4ba9b4ef8d830a46b8a1f93853</md5file>
-<md5file name="compta.lang">1d62bb5c969457e698342f5f8c22d153</md5file>
-<md5file name="suppliers.lang">526eded1162a09941869ab46ef83ef71</md5file>
-<md5file name="opensurvey.lang">bf1409395306f2b2924a67beac05dd56</md5file>
-<md5file name="donations.lang">7ec990a748195e943c1d78619a7be987</md5file>
-<md5file name="contracts.lang">ecb08089d6cffff8cce5bc9928dbfda5</md5file>
-<md5file name="deliveries.lang">e0a2135bf8ba78d71c0162491021d9bb</md5file>
-<md5file name="mailmanspip.lang">ae2a39ed84e9a8b31e97d34efd50bf79</md5file>
-<md5file name="install.lang">46a53285a864300207f4759f5a35b928</md5file>
-<md5file name="propal.lang">95562f393025b7c7156e666cb8b45bc6</md5file>
-<md5file name="main.lang">f722bd816e9904cf0c1a20c807b43493</md5file>
-<md5file name="languages.lang">81e4b3dc3d76e5272b16447d10ae43a8</md5file>
-<md5file name="bookmarks.lang">2ba914ba1f287a51e96117c8734d0370</md5file>
-<md5file name="sms.lang">98035fec612b1dea0f11fa299377d2bd</md5file>
-<md5file name="dict.lang">cc44d8f6611ef62af800332274ddf91d</md5file>
-<md5file name="mails.lang">f84dfcb30b9046145c153fe1e44201da</md5file>
-<md5file name="printipp.lang">599dc37a15c362ea63096dfbf7f57bf1</md5file>
-<md5file name="other.lang">52b36012424c817a4e9fc5736417709c</md5file>
-<md5file name="commercial.lang">ae4b679a3888906e9e0544dd5a54d83e</md5file>
-<md5file name="salaries.lang">1bb02f5007b998c89755a783129afce8</md5file>
-<md5file name="trips.lang">d7db058dfc7cd6d999d30e337b78fb5c</md5file>
-<md5file name="sendings.lang">df5f2db52f342e27dde87f01bcbd8e7e</md5file>
-<md5file name="accountancy.lang">df44b34058c4cbb5c49a9493dd42014c</md5file>
-<md5file name="externalsite.lang">98e1082970a865bf1264472c0367b2ea</md5file>
-</dir>
-<dir name="/langs/en_ZA" >
-<md5file name="main.lang">83d58d7245d7473a79ece8004d881b7c</md5file>
-</dir>
-<dir name="/langs/el_GR" >
-<md5file name="projects.lang">617b7a71655bef18290227c4bf1bcf31</md5file>
-<md5file name="cashdesk.lang">c4000c3a5f961950001bdbf0eada3ea1</md5file>
-<md5file name="workflow.lang">7d36ebf391461a17289c2b5be7cf3e85</md5file>
-<md5file name="bills.lang">1d2b135a0149df6a6cb2e76713216b4b</md5file>
-<md5file name="orders.lang">dc5d5cdb1ddb2cabc4a153dc8153de91</md5file>
-<md5file name="admin.lang">6202f865512c891966572c07fed1bb3b</md5file>
-<md5file name="withdrawals.lang">f42193f1b045aa8b255d4c544bbfbffb</md5file>
-<md5file name="incoterm.lang">577770bc1b047e531d1c8915b91c1b3a</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">b46d5511e9d6998ff9c889cb8c0da1e8</md5file>
-<md5file name="members.lang">0206639eae0df85877c2e2bcf3a6f449</md5file>
-<md5file name="ecm.lang">5e31f5e7cbecac3ea5023184356defd2</md5file>
-<md5file name="link.lang">d71799a2249c450279ae7a1ac3d0f805</md5file>
-<md5file name="commissions.lang">f8a9ee9349754eca7dd8fa4a3b30923c</md5file>
-<md5file name="stocks.lang">208960ca78917b6337d736cd20344a7f</md5file>
-<md5file name="products.lang">132a5130a93dc5d9c2427643a6a77f9f</md5file>
-<md5file name="printing.lang">e7c013349082da3d9d5648c430c5fa17</md5file>
-<md5file name="banks.lang">378829f3a958e6a275729ee6bfe3884e</md5file>
-<md5file name="agenda.lang">403bc95d966adfd004f72ad0b8d859ad</md5file>
-<md5file name="help.lang">426904859bbfa17b03832bb45bb04199</md5file>
-<md5file name="holiday.lang">f366f1450962fc633c712a57bcffe300</md5file>
-<md5file name="productbatch.lang">c5c8e08bddcd4b099e4421c7b876d3ca</md5file>
-<md5file name="resource.lang">2bad6855dcaaf4b18c3c92f32d94893f</md5file>
-<md5file name="categories.lang">81bfbfd57357a74c3f3af6987afe6f12</md5file>
-<md5file name="paybox.lang">6df89d2d8ac7b9a5f06251fa71023e8e</md5file>
-<md5file name="ldap.lang">d2eecb1e8e4fb988dda81bbeb97746c2</md5file>
-<md5file name="users.lang">6986b606c49e4c713e68f9e22eea0545</md5file>
-<md5file name="companies.lang">c92a97950deec22447c477d27006cb2f</md5file>
-<md5file name="margins.lang">0cd221c2bb64eec3f3b8ba5efd62ea57</md5file>
-<md5file name="ftp.lang">bc2b11200433ed6ba13c2b7b6adae99d</md5file>
-<md5file name="exports.lang">95b9193442f1d15db4c8183833ca0b14</md5file>
-<md5file name="paypal.lang">e9ad12e8ccc33746292e9e23f1b8f140</md5file>
-<md5file name="cron.lang">cba7b7e8e5181e09cfcc945401729cb6</md5file>
-<md5file name="interventions.lang">d0c65ac03d5b84bf70da4651a599d923</md5file>
-<md5file name="errors.lang">a89a9c412846d94b22ded4a4b1214e1a</md5file>
-<md5file name="compta.lang">84ce4e1c0ec963dde4e4763f0a1aac85</md5file>
-<md5file name="suppliers.lang">5b5244f55e8874f9677d30a8decd9347</md5file>
-<md5file name="opensurvey.lang">2a5e5c20e225efad5f6b841ad0847617</md5file>
-<md5file name="donations.lang">260a28780209a054543aeee4e3431afd</md5file>
-<md5file name="contracts.lang">ca1db9bd5d22039d6b84051acb6a1d96</md5file>
-<md5file name="deliveries.lang">02117a18e23e6d3fa6af33209fb0e6b4</md5file>
-<md5file name="mailmanspip.lang">491fa67114d3c382ca11c8beda1d2481</md5file>
-<md5file name="install.lang">b8c1b21a0a71c89c4ad86f0caad6bf5c</md5file>
-<md5file name="propal.lang">fda71a80dc11279fb51ad436388c1256</md5file>
-<md5file name="main.lang">b2e188e8065680615a750004643b9886</md5file>
-<md5file name="languages.lang">d4f2c2105d4c3202307ff7271e0126c7</md5file>
-<md5file name="bookmarks.lang">f0b4dcb4ff338aae365219b7c90568c9</md5file>
-<md5file name="sms.lang">0495a2ce04fae425dc6a1d880ceb1dbe</md5file>
-<md5file name="dict.lang">f7261490003c49efcba34cb82f632fa8</md5file>
-<md5file name="mails.lang">51fbfe71f84cccf26bd128b1e071841b</md5file>
-<md5file name="printipp.lang">bd3097dcdf63e182214dda4005b47019</md5file>
-<md5file name="other.lang">3938c337aa3ce2a9cd50c8e9e9d9628c</md5file>
-<md5file name="commercial.lang">4a0090b0404ea085edfbb456f8bc4c92</md5file>
-<md5file name="salaries.lang">b3b43d5b59898b53c3438acc767d5fb3</md5file>
-<md5file name="trips.lang">8fe26f5460eea59779e88aca24436dbc</md5file>
-<md5file name="sendings.lang">6f17157fa2d3d23e0552c7ef33efd818</md5file>
-<md5file name="accountancy.lang">364c9b4bc0b3ffbbed25ffed1975bcad</md5file>
-<md5file name="externalsite.lang">381fda47b3c28be5e86909a54ecf6f72</md5file>
-</dir>
-<dir name="/langs/eu_ES" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">e9d9615574990c4896b9dfe4feab490a</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">7402b6940e9c0b9451d1961728a1377d</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">3aff154bc0917d13e720e626aef6d884</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">a4689ed797b5bb6aa0712da0992c463e</md5file>
-<md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">4cb220fe081dc71e7a79155fb4baf1f9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">53f30292c85bf4e6ec62ba51a1411794</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">453b10bf9feae2447a1e1a28d2d6ed05</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">3e338d94a6d5b803d52b5c431597e35a</md5file>
-<md5file name="languages.lang">bc244d4f47eb26a3a24f2e61ed6fe324</md5file>
-<md5file name="bookmarks.lang">3e3baa2a47af2ba7525ad71522d6ed85</md5file>
-<md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
-<md5file name="dict.lang">464e3cd1b9ccd7bb22bfdffb69ecf33b</md5file>
-<md5file name="mails.lang">ad5d0b141c1b1009144f9f984bfc6e72</md5file>
-<md5file name="printipp.lang">dbe76f9c3c57b312b0d6e217b9f2a1b5</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">bb01af22240766173cc185e6857a73a3</md5file>
-<md5file name="salaries.lang">678a224c72ab87f381b25228890f9eb6</md5file>
-<md5file name="trips.lang">9cc0a9a23709b0640fdc94021a6b953b</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/en_US" >
-<md5file name="projects.lang">3ef9403b403f368448802a108a9faa69</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">62922eb1ad1501e02b86da4f0c8f1126</md5file>
-<md5file name="bills.lang">f9002a564c0dd7ff3ed4f7974a32c568</md5file>
-<md5file name="orders.lang">a395d5fa15b0fd8a40e70a9a71e1df04</md5file>
-<md5file name="admin.lang">686db095e45737b7253cc56f3ae90a99</md5file>
-<md5file name="withdrawals.lang">e272b24123a940834eb7384c732c3c51</md5file>
-<md5file name="incoterm.lang">e696620abb33dd46cbcc1d87e8f0abca</md5file>
-<md5file name="loan.lang">7db2f1cdec58e462f71191b33e61c71c</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">711b566364586ed91ad85af0fbe5f845</md5file>
-<md5file name="ecm.lang">806ea2c3f875c43ad984200eda43655a</md5file>
-<md5file name="link.lang">c301b029c76cb799f86ff9c9861ed8e4</md5file>
-<md5file name="stocks.lang">9e8dc82511a1687d973e46fe447e61dc</md5file>
-<md5file name="products.lang">8fd152ecbacdacc82216f02cb6b5a2ec</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">1f09d30173ce97de4233473c26991e67</md5file>
-<md5file name="help.lang">d9472c4c816f496c95e5f408e8465767</md5file>
-<md5file name="holiday.lang">db70e7c77f6d301c06248b0884962224</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">01d7079eb9464d34ebc58d2987977733</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">e91158781f161b3767242ebd45da0518</md5file>
-<md5file name="companies.lang">fb08e158e49baf04efa53b9e931b2710</md5file>
-<md5file name="margins.lang">149cd6bc5dea21091638b42ec3340592</md5file>
-<md5file name="ftp.lang">eead927af63207df007d30bbefa0bb40</md5file>
-<md5file name="exports.lang">d7ce2327d263736100f77cd6eb4cb24b</md5file>
-<md5file name="paypal.lang">75fb4c310c4f0554d3ac9859d0c5b646</md5file>
-<md5file name="cron.lang">3314a3c5291bc6ae803c15e9bbf5198b</md5file>
-<md5file name="interventions.lang">20e258227a894b386eede1b35678519f</md5file>
-<md5file name="errors.lang">fda688eba93b22d6968c70f168bf6726</md5file>
-<md5file name="compta.lang">27b1a2f505b85bddf00c3be9a1f82edc</md5file>
-<md5file name="suppliers.lang">e32ccf9a79a12abea200e2a94c2a95d3</md5file>
-<md5file name="opensurvey.lang">6f3b6f771da549d8e22263e795ddecaf</md5file>
-<md5file name="donations.lang">824683c2bba8c209bd757096e7b7e21a</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">239bcb951d596b8d3481caaf19bf8fb7</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">06dbab5aa01cfd24ae96ab470102513b</md5file>
-<md5file name="propal.lang">d4962dbf14773e0e4e20fef6291149ff</md5file>
-<md5file name="main.lang">f30b21c6c169fe48e1f60d808599d703</md5file>
-<md5file name="languages.lang">58c41f60235ea1a5fb3991bc4fa6a24b</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">6f2a62f976e213c77fc7b1e1cde5ec47</md5file>
-<md5file name="other.lang">cab808a7c9be3e83a0e4d9bd65692563</md5file>
-<md5file name="commercial.lang">bc3adb1572566d2f86e728581bf4e7e2</md5file>
-<md5file name="askpricesupplier.lang">d107b7336d609d8147c434d9f2e7ff92</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">d40d1b7a7b953ff9facc32e3abc8f331</md5file>
-<md5file name="sendings.lang">e3da2efff4a9d6b182e61859036a1213</md5file>
-<md5file name="accountancy.lang">d441c14fad72488f2b186bb3bec864ca</md5file>
-<md5file name="externalsite.lang">924c656e4301df08646901c0ff6971ed</md5file>
-</dir>
-<dir name="/langs/sq_AL" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">a918453d2232f6042139a51f4be59995</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/tr_TR" >
-<md5file name="projects.lang">3fc8f6eea78a72252d5beaa95980b119</md5file>
-<md5file name="cashdesk.lang">a8c0d300734b6d141fea36463cafb665</md5file>
-<md5file name="workflow.lang">ac0b80589a46c746d461c26c203976ed</md5file>
-<md5file name="bills.lang">46574f10a368b3bc5dd28bd954e438f0</md5file>
-<md5file name="orders.lang">301653ecefd6bf66f64c9d1295320592</md5file>
-<md5file name="admin.lang">ea428c8c8795d443e495cc24c1d4564e</md5file>
-<md5file name="withdrawals.lang">bfefaecf0b2d4c3cbca546a629f13a3d</md5file>
-<md5file name="incoterm.lang">07bbf1314ee53209e4d8cf452881caca</md5file>
-<md5file name="loan.lang">a844ce312e01fb23c7007783d7e8444e</md5file>
-<md5file name="boxes.lang">06b09b671e4f3c2c4f6d6543f6d01e36</md5file>
-<md5file name="members.lang">6860a3f3b0469b68220888089b64141b</md5file>
-<md5file name="ecm.lang">fd3a3c865fdf8572f4afcb889760a65d</md5file>
-<md5file name="link.lang">4095b242985be141d15d3dee76e155b4</md5file>
-<md5file name="commissions.lang">817e3122945ecefbc4ce8abe613858b3</md5file>
-<md5file name="stocks.lang">e17c63b9d34d92e8079dd835dcfd50e4</md5file>
-<md5file name="products.lang">a8d8861b0947a0c3b0e4b783a8c91878</md5file>
-<md5file name="printing.lang">ba4e18112a68a41da78cd63499f03a27</md5file>
-<md5file name="banks.lang">98ee8520e083cd3278a60b8210d5856c</md5file>
-<md5file name="agenda.lang">85c2fec90c3e685ac938f0abedcd5af0</md5file>
-<md5file name="help.lang">0d0f009398a7487d59b485e07c6fbc73</md5file>
-<md5file name="holiday.lang">45c213d6037f4cafb6f20e00e41dde29</md5file>
-<md5file name="productbatch.lang">e5f10f65ec52fdd1433f2a477b70e5ad</md5file>
-<md5file name="resource.lang">a5affc357e84c82d0cb507e7d977faad</md5file>
-<md5file name="categories.lang">6b6af95ceda28abd4dc15b6ca31163d8</md5file>
-<md5file name="paybox.lang">856330df4d912ce65a7471b677c00e1b</md5file>
-<md5file name="ldap.lang">86c9af02e6afad6b682cab386e7ea8c9</md5file>
-<md5file name="users.lang">3edb04f22096528f3007755fdb835f19</md5file>
-<md5file name="companies.lang">7bbc958481dc3893f3cf8773d423a431</md5file>
-<md5file name="margins.lang">64944593ac8346ad7b11d39a2271b7a4</md5file>
-<md5file name="ftp.lang">e9d05511b26b0ef2129febfed311fd82</md5file>
-<md5file name="exports.lang">28f76487cf245a01c1aef56ed36952b9</md5file>
-<md5file name="paypal.lang">0fc0876df57f7f77cc4ea959f60cde11</md5file>
-<md5file name="cron.lang">87d2058dc22f63411ce8ac827f7448c1</md5file>
-<md5file name="interventions.lang">0a23c46c92cd5ce1e5d14d1024f23c23</md5file>
-<md5file name="errors.lang">b55b4d1269910ed9d04300d6bd1177d5</md5file>
-<md5file name="compta.lang">18de668a964f71520a4c13247f012fd6</md5file>
-<md5file name="suppliers.lang">694ca7bee57efa02867473a6d8a2facd</md5file>
-<md5file name="opensurvey.lang">686ec6633c3b45fa9982eb392deabb4e</md5file>
-<md5file name="donations.lang">71355302efbca5596c245b4f75b1a24a</md5file>
-<md5file name="contracts.lang">40d150eef5fa77907360c362ed0f51a1</md5file>
-<md5file name="deliveries.lang">49bb3d81ae611eb1f8b7868143b2c6e0</md5file>
-<md5file name="mailmanspip.lang">32e21134466b972be3ac1268599f9b5a</md5file>
-<md5file name="install.lang">e95c5f8ecb76148b002032075db39a4d</md5file>
-<md5file name="propal.lang">dbc7149f4d61e7d862146daa4f28d9c6</md5file>
-<md5file name="main.lang">a2f38be9f4d829be2f19131667e6acef</md5file>
-<md5file name="languages.lang">c8b51b30dbf56b8f6db92072e172189c</md5file>
-<md5file name="bookmarks.lang">9cd23f8d97fddad9f3408b5d5152cdcf</md5file>
-<md5file name="sms.lang">578c7ef90ce4f50122f14d6630079c47</md5file>
-<md5file name="dict.lang">db18fa6d13acfd83d28575f83a3f395c</md5file>
-<md5file name="mails.lang">889dd20c43597110b85a88bf6485ba60</md5file>
-<md5file name="printipp.lang">3226fe6588555150ef8772f1b2c1459b</md5file>
-<md5file name="other.lang">f4b0c998c31f5889f65deebd633f7fe4</md5file>
-<md5file name="commercial.lang">33f56a87ec96204fe40ffbc69fc9aafe</md5file>
-<md5file name="salaries.lang">c6f42df909428c4ac4a2a5a0d1020d2a</md5file>
-<md5file name="trips.lang">fda8fcbfef4dc90fd00742cc546048e5</md5file>
-<md5file name="sendings.lang">14fefc7629e7e8b1aa195c290306cbea</md5file>
-<md5file name="accountancy.lang">b88bcae402852cf0a1ade81c22d70ddb</md5file>
-<md5file name="externalsite.lang">ccd8e25db8a9a768172fcd2e45b95162</md5file>
-</dir>
-<dir name="/langs/bs_BA" >
-<md5file name="projects.lang">2a83de4de86c7c4cddd5490d96adbe0f</md5file>
-<md5file name="cashdesk.lang">223494e86e72306be4f941b847db565a</md5file>
-<md5file name="workflow.lang">dfa97a9faf2ba1a451e553c77076d2a3</md5file>
-<md5file name="bills.lang">e7321cb16b9e21054e745a347a57efc0</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">a05de2beef80af2512e8f3c61f25dcc9</md5file>
-<md5file name="withdrawals.lang">d4b33c76f50f3d94ad1af21601d68e7e</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">b23a1732f01a5c23da70dc85205c1bea</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">c09f84e25a1c8970c5572077805ac0fc</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">e8510da20738abbfa73214de54c93984</md5file>
-<md5file name="products.lang">e572268f81dfafbf40cc085b745e52e6</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">549b51a8af5c6eabe8b7fdb9f981da00</md5file>
-<md5file name="agenda.lang">36fe95f9d0f092d61a637e11e3c32a27</md5file>
-<md5file name="help.lang">c0c0cda5b564e56624844d49d7592502</md5file>
-<md5file name="holiday.lang">a1c9e5d5a5cc8920f578a1817aa181b0</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">e652cc0024d38444e191c28a95943594</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">3d8ba71a2cf2af3c2a9e9bda1cba64e4</md5file>
-<md5file name="users.lang">b1d534a15eb4b0b99bda0de853ae40d6</md5file>
-<md5file name="companies.lang">81ac81600fa899832975179408bd4ce2</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">bd3a753cb12c1a7c828fecc73e5b052b</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">5826378cfccf1f9dc0798b3357870fa9</md5file>
-<md5file name="interventions.lang">e50f64efdbb21cc02ec473069dd5d5c3</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">3450069da49e2b34436578915d3812eb</md5file>
-<md5file name="suppliers.lang">254a30763f15f9f555e82ccc4accdbac</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">a5e8c5e7b6e275f6fc080d12bc66afb7</md5file>
-<md5file name="contracts.lang">cbd8a157fa609eec0ae1d041083cbd38</md5file>
-<md5file name="deliveries.lang">262b3b0bc7533232290f81311955da86</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">49f5a91ffbc90b04607fbca87a866532</md5file>
-<md5file name="main.lang">c149e810ccf8f48a95c04a544050cab8</md5file>
-<md5file name="languages.lang">126ca4a6ad5a178e0a091196ba5b7a37</md5file>
-<md5file name="bookmarks.lang">71976afc3ec5e0f9c2e3711d8261e0b4</md5file>
-<md5file name="sms.lang">5dc4c70ab6811882ea50d20e2c4ea6e5</md5file>
-<md5file name="dict.lang">f9f034777e38a444b4bde55bc7e37b1f</md5file>
-<md5file name="mails.lang">9ab8faeac0f57da542c29bf3cfef097a</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">d3df7cf574504af3ed4feaf99bb5e468</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3a1f51816608cc8b2c9ae16fb92b4ec1</md5file>
-<md5file name="sendings.lang">16504bda24ef73dfed5a0ca25a2649e0</md5file>
-<md5file name="accountancy.lang">6f3a1ed7c63d57511c1dde760e76e320</md5file>
-<md5file name="externalsite.lang">efb80873052a0acac270873400da3e43</md5file>
-</dir>
-<dir name="/langs/en_SA" >
-<md5file name="propal.lang">2bedaf545935cf1ec76cf1bbe2be8b11</md5file>
-<md5file name="main.lang">cf387e494e1e47b7da074828e0994d78</md5file>
-</dir>
-<dir name="/langs/sl_SI" >
-<md5file name="projects.lang">79e35bad8654e5df8c4e9546da9fb559</md5file>
-<md5file name="cashdesk.lang">ab07c46fbd99585cf69935bef969c5d5</md5file>
-<md5file name="workflow.lang">0dd290bbca23f1341e63156248ae06a8</md5file>
-<md5file name="bills.lang">25485ee150a22e1a49407c26c037da7e</md5file>
-<md5file name="orders.lang">198b3a29bd95db8f58b32d7db4bff003</md5file>
-<md5file name="admin.lang">38b9cfeddef49251a216d410d7fa855a</md5file>
-<md5file name="withdrawals.lang">58c19042214fce0286d38a8553680674</md5file>
-<md5file name="incoterm.lang">5f9bc55c61786609f6d57cc987d8f688</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">ab89fbf62d7046c7327249be47ccefeb</md5file>
-<md5file name="members.lang">4eb5ad81317fab87396acc720d75138d</md5file>
-<md5file name="ecm.lang">d01407b81e6e2b6828c77cc12e908df7</md5file>
-<md5file name="link.lang">11d893fe91006d73a3558095fea02ea2</md5file>
-<md5file name="stocks.lang">20b3e0e6e75fd590b98bb3cb3773ea01</md5file>
-<md5file name="products.lang">c10315e367f8b9a00c84683b55e7b18f</md5file>
-<md5file name="printing.lang">34ef2a5c01a6de0d058eb647a73cda4f</md5file>
-<md5file name="banks.lang">9a9b37f72b28548b6785b6b1b9baf57d</md5file>
-<md5file name="agenda.lang">7df456c127e3cb8ae8ae1a74f56c9c16</md5file>
-<md5file name="help.lang">593a0056ee80a54a01c01c0c266034d4</md5file>
-<md5file name="holiday.lang">b0b74e46aa192d770330430bbcfe1879</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">c055194f1ab2455af2250ede540f75b3</md5file>
-<md5file name="paybox.lang">df87ce706058e3da66cfb2d15979958b</md5file>
-<md5file name="ldap.lang">8ed0c3b65f002cc1c9ee534820e5f961</md5file>
-<md5file name="users.lang">40e0c792b4859dc438412503a3cd5a5a</md5file>
-<md5file name="companies.lang">c954418bd592b9882830e1befcde1281</md5file>
-<md5file name="margins.lang">2b8391c74ac95a9c89c539f0e332ad49</md5file>
-<md5file name="ftp.lang">5df5b3e78e06355290ce7d76b900f925</md5file>
-<md5file name="exports.lang">f4d054deaa28f3e99a6d0914aab68185</md5file>
-<md5file name="paypal.lang">311ad06ab23f03ff3440597edf1da3fc</md5file>
-<md5file name="cron.lang">0edeb4fdfd326d018af56a8424a10428</md5file>
-<md5file name="interventions.lang">a2917a00203975ddeba877800e723ea1</md5file>
-<md5file name="errors.lang">5a28672d7b6bd9aca2b7a79b616369bf</md5file>
-<md5file name="compta.lang">ef1f2c378f4f4b96dbd7a370d52d495c</md5file>
-<md5file name="suppliers.lang">f074e9bd2d03d456bfb5c45d912515f9</md5file>
-<md5file name="opensurvey.lang">15558c69fd903afd9e88439226123622</md5file>
-<md5file name="donations.lang">768f3e2b92cc551d7136bbf830e93951</md5file>
-<md5file name="contracts.lang">1085ef3d0869bfe5d3d113ad6d651da1</md5file>
-<md5file name="deliveries.lang">6312dc067c98595bb72d77dfcc9344b4</md5file>
-<md5file name="mailmanspip.lang">95c15ca3dd5f1f6760ef60df52b6dac5</md5file>
-<md5file name="install.lang">81026f55013298b6e61a890c55ce2fa5</md5file>
-<md5file name="propal.lang">d360b1161b553a45255a5806f55382eb</md5file>
-<md5file name="main.lang">4b01e02157fd54947a64cffdba8d2d18</md5file>
-<md5file name="languages.lang">44648ef9b872cfcba9ce4649b09a274f</md5file>
-<md5file name="bookmarks.lang">2c7e63fd6233af8fabc598cea968cd6b</md5file>
-<md5file name="sms.lang">16e0a85f28a66c9fe5ef46a42e9775cb</md5file>
-<md5file name="dict.lang">536398fa35f4c75fa3c3d65c98c37939</md5file>
-<md5file name="mails.lang">b0d636e02a31b72a5cec289b72265f29</md5file>
-<md5file name="printipp.lang">169b60e8323c73a4dfe741da1df9fc10</md5file>
-<md5file name="other.lang">92f42144ac3a3507ef0270f8342e36fc</md5file>
-<md5file name="commercial.lang">335c7271570470d0a11512be609e3a45</md5file>
-<md5file name="salaries.lang">312c298b22e1902df441bf41c0598c88</md5file>
-<md5file name="trips.lang">bf2fa0709a1afa93c391eef32d37f171</md5file>
-<md5file name="sendings.lang">a9761ba2043c4b97757891489f325dd4</md5file>
-<md5file name="accountancy.lang">faf406bb0e3127ee1e9f424a9db81d48</md5file>
-<md5file name="externalsite.lang">db1b7476ea8ce223faa772b7f66621b8</md5file>
-</dir>
-<dir name="/langs/zh_TW" >
-<md5file name="projects.lang">e29675921ca8b0602917a823d5028e29</md5file>
-<md5file name="cashdesk.lang">afaf8c79e4a90aa57382f99ed2d40f1c</md5file>
-<md5file name="workflow.lang">67ea5ed5ea373574dce57608e11f429d</md5file>
-<md5file name="bills.lang">63fb124d0f5976ec609fece7f3ad23ad</md5file>
-<md5file name="orders.lang">cb363e312cfa50f3d9536bdaf33441bf</md5file>
-<md5file name="admin.lang">018d30f9195ff56d94346d8d21780af2</md5file>
-<md5file name="withdrawals.lang">e5e7ed101e5fbf690c1f58d77b666720</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">66dbdb37fcb836537092935a31655cdd</md5file>
-<md5file name="members.lang">b1d0a182408ca65a6bba2eccf83f05f0</md5file>
-<md5file name="ecm.lang">16737b3e033c599ba1de2b1653ff5591</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">0ff5cad40b13007a6e4dd81f9bd72dbd</md5file>
-<md5file name="products.lang">006597a6e9af4637e424f47a28a7b247</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">ccc22346e54d37117a732ab094d41986</md5file>
-<md5file name="agenda.lang">1116f9450413c4fe11aecad38e8ed25f</md5file>
-<md5file name="help.lang">7e2ccffaf9bf9dffea7c800c687a3a6c</md5file>
-<md5file name="holiday.lang">bf512a71c20efd497ab01bd83f07737f</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">2104a3716b6074c739b153108c99c597</md5file>
-<md5file name="paybox.lang">9dde1229f064c66f6497f31dde78906a</md5file>
-<md5file name="ldap.lang">6373b95c48af4f71972938535912fc8a</md5file>
-<md5file name="users.lang">367f6bfe53285d7880def87ab63b790a</md5file>
-<md5file name="companies.lang">31f32d0cb237acccded5584aaa05225a</md5file>
-<md5file name="margins.lang">a05af8369cf1eca3ea4b3b0cafa3ffed</md5file>
-<md5file name="ftp.lang">020f5f3eae4387d4dc019eccd30a2d1b</md5file>
-<md5file name="exports.lang">85d5865b208ca3ce1c68e597d6834f92</md5file>
-<md5file name="paypal.lang">69a140a13b73949262053829615d06ef</md5file>
-<md5file name="cron.lang">02289e9b37a7aecba5c0fa022f167487</md5file>
-<md5file name="interventions.lang">fda33aa5946bbd06f06d3889c81f135b</md5file>
-<md5file name="errors.lang">e32a6738b9127c8a9c976478fcda233e</md5file>
-<md5file name="compta.lang">ed2cdba45964552b59ebf9bdb1b566e8</md5file>
-<md5file name="suppliers.lang">121f5d278e77c82d476ddbcaab81a331</md5file>
-<md5file name="opensurvey.lang">d35a21763c1765d888ce5e9f7192d161</md5file>
-<md5file name="donations.lang">b1ae2db4e6abd7b1b88a48e222cf37a5</md5file>
-<md5file name="contracts.lang">a04d9cb8e3a3b5e923c349a2dfed9290</md5file>
-<md5file name="deliveries.lang">2af14f6c4b858b8816b24c596aaa0888</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">0003fa5cfecb0311b7f260d15b8c55a0</md5file>
-<md5file name="propal.lang">f07e3aa557243cfef5ef06bdd8dba07d</md5file>
-<md5file name="main.lang">b9499528fcf9dc3b194032dabb39dfce</md5file>
-<md5file name="languages.lang">6a44563847fd7fd414a91594576d6ff3</md5file>
-<md5file name="bookmarks.lang">d9f11c2cc6a7b5929a915d7a998e925a</md5file>
-<md5file name="sms.lang">ef8d5f107a66b6aacb79a8a4f5d01757</md5file>
-<md5file name="dict.lang">9db68f434b6113836433bb3a671e71d0</md5file>
-<md5file name="mails.lang">7403f69899649448cd99496d1332e3cf</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">152145bbdd3b66b8ba05238b8d6967d6</md5file>
-<md5file name="commercial.lang">a3bacfe77dbd44410c277a003246c307</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">5f0890bbb168309b359831a191a3e8cd</md5file>
-<md5file name="sendings.lang">ea7921a38541879d8044e9729c9e87d8</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f249c5416780b6370b92514232af8da7</md5file>
-</dir>
-<dir name="/langs/de_DE" >
-<md5file name="projects.lang">27d3cdf8f704d01d0b46f8579d39b967</md5file>
-<md5file name="cashdesk.lang">96d264ca8820d06e79142a24331876a2</md5file>
-<md5file name="workflow.lang">236388ae2d5c562bd3b7123817527f73</md5file>
-<md5file name="bills.lang">2a7d1b0f704d29951c30ea866c85c530</md5file>
-<md5file name="orders.lang">0d26a4183a05beee36f73348e05ac1a9</md5file>
-<md5file name="admin.lang">74f2da3d9db3fd92bcf151c99c38c332</md5file>
-<md5file name="withdrawals.lang">7372240ddcfd567371833e17c55cf3bb</md5file>
-<md5file name="incoterm.lang">5fd0cdbdc0238bc2f9c0fde2e1cec05c</md5file>
-<md5file name="loan.lang">45ffe99a918a7bbc4a6042bd1f7ded89</md5file>
-<md5file name="boxes.lang">edcd6f0e266ebd3f8889d44444b1f874</md5file>
-<md5file name="members.lang">6ffdee3464337d9022910038309669df</md5file>
-<md5file name="ecm.lang">2213ae80db2f9c6a475e1209d31ed2f7</md5file>
-<md5file name="link.lang">0ae23305ea3cfd8406dc0c57deece00c</md5file>
-<md5file name="stocks.lang">817ce0b47f0dba9656d1ad1583596161</md5file>
-<md5file name="products.lang">39cf133dcfab23f3646c1de536a6c44a</md5file>
-<md5file name="printing.lang">5ed5c5747e7602e1b128fc541e0a2ffb</md5file>
-<md5file name="banks.lang">6d3c96840e498d14d87f582c06075e37</md5file>
-<md5file name="agenda.lang">507560124bb9af9903a36e155fba3c96</md5file>
-<md5file name="help.lang">94bb9cad9889690d55670af89e832ee8</md5file>
-<md5file name="holiday.lang">5c83c1f4cfc547129cf52ea69fe2a19a</md5file>
-<md5file name="productbatch.lang">4c7673b351fab33e0a33fa2910faf0d6</md5file>
-<md5file name="resource.lang">c36fa900ef2e082506bccd1fa51eed31</md5file>
-<md5file name="categories.lang">e93c689a6bd1cf8e7670e4aec826d763</md5file>
-<md5file name="paybox.lang">d19ff90add77cc081a9daf23f5b604fe</md5file>
-<md5file name="ldap.lang">3080ff9fdb247eaf98b234710abdc34b</md5file>
-<md5file name="users.lang">87a5230bbfe882e0fbafacdd6fdcc67e</md5file>
-<md5file name="companies.lang">9adc818af1aae210b0d7d81c03a676ee</md5file>
-<md5file name="margins.lang">41f6a7ee8a9f798c0af92c1ca1dcf5bd</md5file>
-<md5file name="ftp.lang">1baebe20cdfdc3217fe9a2ca774cadde</md5file>
-<md5file name="exports.lang">57976b7ef9e27bc6d12064dafff2eea1</md5file>
-<md5file name="paypal.lang">64d4f3497d67b4e8da246b865501955a</md5file>
-<md5file name="cron.lang">b66283810f815e888bc6f5ae1b52a6ac</md5file>
-<md5file name="interventions.lang">d35b6c40bdb2346fff2069c5616acd9a</md5file>
-<md5file name="errors.lang">f4f6df6dba47bcf07161c5eab2fda0e4</md5file>
-<md5file name="compta.lang">c3777bb05106623a66ab54852c8dc6d2</md5file>
-<md5file name="suppliers.lang">77d571e5b03acdb7a2029a4f9218a323</md5file>
-<md5file name="opensurvey.lang">a40157ef24e9a8c6ddfd3885dc186a96</md5file>
-<md5file name="donations.lang">056998dce70220b02ec8ed7855ac8b8f</md5file>
-<md5file name="contracts.lang">50d7642780c847932b5928f5ddc419bd</md5file>
-<md5file name="deliveries.lang">3533fdfc61408e851bdb68653ea870f0</md5file>
-<md5file name="mailmanspip.lang">cf24f0f04a6026a4d06cdaa7617586ac</md5file>
-<md5file name="install.lang">78ac49e887ee1d6d5dd1840b6a81a3b0</md5file>
-<md5file name="propal.lang">2f46b0cf8ce598febf0c2f66eff0b230</md5file>
-<md5file name="main.lang">b7e633ee1c659326e118ecc31f6dc763</md5file>
-<md5file name="languages.lang">4168e4479deb6e95d53ffbced50238f3</md5file>
-<md5file name="bookmarks.lang">53794030a3a02da1d3ebd2b15b95af35</md5file>
-<md5file name="sms.lang">8c97316eb2f2f1cecc299b68969243fb</md5file>
-<md5file name="dict.lang">6f3ad06950f1c62f4bd86e51a7ddae95</md5file>
-<md5file name="mails.lang">96efcb427a067568896a54d9cba6a836</md5file>
-<md5file name="printipp.lang">2d1ed344ed1f795dc8ca3acc51cfeaa8</md5file>
-<md5file name="other.lang">0f487a02eb56c25838b3ca7a44e3d340</md5file>
-<md5file name="commercial.lang">23cd5ee0ff6441087199ef3f6f48f4cd</md5file>
-<md5file name="salaries.lang">4c1471fc81697146f2072c4c55b16a9c</md5file>
-<md5file name="trips.lang">24ec07bccd0232ebebd94716dd6abaf9</md5file>
-<md5file name="sendings.lang">7f96e18c0ac56314a33e35de090c5045</md5file>
-<md5file name="accountancy.lang">6eb12d57ce64ecf36d5a78932208d1bb</md5file>
-<md5file name="externalsite.lang">cbfc8102d5d4b206ce17095f41a08013</md5file>
-</dir>
-<dir name="/langs/es_MX" >
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-</dir>
-<dir name="/langs/he_IL" >
-<md5file name="projects.lang">e0758c864058df5f23cc35ab0df1d31d</md5file>
-<md5file name="cashdesk.lang">055d1c1ecd19be7fe0fc879d5b9e3920</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">1dc894ddc8e2fa310a70a3bccf815df8</md5file>
-<md5file name="orders.lang">10bfcf3c45c4b93043b846371d2de319</md5file>
-<md5file name="admin.lang">2dbd45b0367937f1ef79d8cd02d8eb4d</md5file>
-<md5file name="withdrawals.lang">4ed0fa2252887fdaad281c4fdd581138</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">5f236327d99c1d860357c98d6123b40c</md5file>
-<md5file name="members.lang">8105015382c2477cc7e91f83ef6c4e61</md5file>
-<md5file name="ecm.lang">5d687f7e28621e97af2a7b1290efc658</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">dc396506b334ea8af343c8c8161be20a</md5file>
-<md5file name="products.lang">0fd2a60ce0edd282a64cae89f30106cc</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">7f5889f7023d1c96adf6c6917fa4c7c3</md5file>
-<md5file name="agenda.lang">4362e150d6fd5db1d2ec3bf6033cf31a</md5file>
-<md5file name="help.lang">f6a494807c8bd81146bf7308b9e74507</md5file>
-<md5file name="holiday.lang">e8b8a56f3c8046b724afa033496599c6</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">4377ad93f7965f894e7d49f0972a144f</md5file>
-<md5file name="companies.lang">b26249640072d8246a812bc6d7a4903e</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">c2b2f7000a5d742699adbc6be9b8011a</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">28e10eab33216fe841a693440d577e21</md5file>
-<md5file name="interventions.lang">3892d45ad15c38243a4c8c570f3db7e0</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">d929cf33013487510df075f5cd5ed46c</md5file>
-<md5file name="suppliers.lang">8cfda215fb90242c0bee3c08f424d05e</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">e92ab1ec80639a8bcba78163e7f632aa</md5file>
-<md5file name="contracts.lang">125545332e86e9da0c16e857d488f35f</md5file>
-<md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">16e708648f259125b73168462459fdf3</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">1305dad2e2014d290bc66c328ff0a8e1</md5file>
-<md5file name="languages.lang">2f35f2744e4e6626a2390abb5effedc2</md5file>
-<md5file name="bookmarks.lang">2b7b7694e9c574c9017760d04b71d385</md5file>
-<md5file name="sms.lang">336e659b54ee694568f9e17c14ba4a44</md5file>
-<md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">06c01cb177f657b18706dc4856a0315b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">7b90980dcbf4d232834606fb8b661045</md5file>
-<md5file name="commercial.lang">7b628e61735e81d30265c89a34b17278</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">b4a7bf2dc4b9d17e3bf96711789653f1</md5file>
-<md5file name="sendings.lang">cd854c5b10b4fbfc95edef5d88b16bf2</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/lo_LA" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">6b36869fa70561852f0dd2237168b73b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">addb82a5473d88074f998158dcf6d184</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">34c7fde492170f80fe8e0e6434f3eb0b</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">f4977effe39cac6245f3789b7dc2eff8</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/fr_NC" >
-<md5file name="admin.lang">978bf026c812ac95e435560c7be4bab7</md5file>
-<md5file name="companies.lang">f3c46414a349aa8f14f7b2bc4224c2c9</md5file>
-<md5file name="compta.lang">bb86a43e02b27e96f1a1a5a4757aa567</md5file>
-<md5file name="main.lang">b72997707e75dd3fb9bb3344408f0fd8</md5file>
-</dir>
-<dir name="/langs/es_BO" >
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-</dir>
-<dir name="/langs/en_NZ" >
-<md5file name="companies.lang">fb46bbe6fd59edc488ae4cf9c9e59be7</md5file>
-<md5file name="compta.lang">129f1bba639c9fb1f3f5b196aff5f073</md5file>
-<md5file name="main.lang">64bfc7f928c8265b954a94f6ba47a472</md5file>
-</dir>
-<dir name="/langs/ro_RO" >
-<md5file name="projects.lang">24e25ba55b35cdcc2dc5a14d7d10570a</md5file>
-<md5file name="cashdesk.lang">cf956add0c79021627f8d296bd9c0bee</md5file>
-<md5file name="workflow.lang">3639365574f377b3d9192eed3012b81b</md5file>
-<md5file name="bills.lang">e6bdc0042aaecd4af937d23e028fe6d3</md5file>
-<md5file name="orders.lang">297d7b4aaed48a75f49c2a5d7856b4bb</md5file>
-<md5file name="admin.lang">7e6f23680749d50953f078c6718e402c</md5file>
-<md5file name="withdrawals.lang">3f97ab7226e1b96805f110c23a0a4e8c</md5file>
-<md5file name="incoterm.lang">91db205f032419631535b76600d49ef3</md5file>
-<md5file name="loan.lang">3ab8cb2ffce4a45ccc2bd36bf7188ba4</md5file>
-<md5file name="boxes.lang">3999a6c16fbac8f142b6ba5c83843135</md5file>
-<md5file name="members.lang">e66c5201b53aff421ab597e250adc59b</md5file>
-<md5file name="ecm.lang">a7f8b687d5627915cc22a52b0332af77</md5file>
-<md5file name="link.lang">4e8f553ac2056a7b9e7e66f9f8cc3b8f</md5file>
-<md5file name="stocks.lang">2c978233c9c2113210abb8d6b7815be6</md5file>
-<md5file name="products.lang">bb854c1ff453090ff74b5c40bffed07a</md5file>
-<md5file name="printing.lang">02b66c8cb37d08bd011ec596985e5b07</md5file>
-<md5file name="banks.lang">17b01c65b668f83ee0e343f558f1f717</md5file>
-<md5file name="agenda.lang">b5cd71ce52f0ea483266db95c9dc08f0</md5file>
-<md5file name="help.lang">0c3ea1ed6f3bef86e72457af9d477b22</md5file>
-<md5file name="holiday.lang">c093d74471eff6a5f33e586d3fdf7843</md5file>
-<md5file name="productbatch.lang">6bd7bd915222c47f064d3cfee5fc59c0</md5file>
-<md5file name="resource.lang">f10cedbccc9475f55d46269a683f0cf4</md5file>
-<md5file name="categories.lang">0a8e6c7063772f6766b3265f9b54bc8a</md5file>
-<md5file name="paybox.lang">a951ffe3e490fa57e2d8b58326957f4d</md5file>
-<md5file name="ldap.lang">8cd714c35a68b56c9190c03579baf70b</md5file>
-<md5file name="users.lang">e2073338990d8009a30b20f79c1e2658</md5file>
-<md5file name="companies.lang">6a1722dc73e6612827ab1dcdd24d0ae0</md5file>
-<md5file name="margins.lang">50360defe4eda5645728358a612f8df7</md5file>
-<md5file name="ftp.lang">b959612b1474a1f2fb2aeb746072551f</md5file>
-<md5file name="exports.lang">e700debbe7f28659cd6ba34da1ec09cb</md5file>
-<md5file name="paypal.lang">5a6bb3c42b5a0bec8c86824f1975083c</md5file>
-<md5file name="cron.lang">87ca04b6f32ec9c86ff4a9496a7e2e83</md5file>
-<md5file name="interventions.lang">0563e414f40984e0f2ad2a584b88bef4</md5file>
-<md5file name="errors.lang">443c0149b9f505cadf88de780d7c5462</md5file>
-<md5file name="compta.lang">69a9ea27bd1ff96e536096fbba4d3033</md5file>
-<md5file name="suppliers.lang">1eebc6a132b4831df2374914d2398d06</md5file>
-<md5file name="opensurvey.lang">abeec7cab968b8b816c16b0dea5dd6df</md5file>
-<md5file name="donations.lang">988b1fd1092a601c62d214658970a600</md5file>
-<md5file name="contracts.lang">07bb126b5d3a17c508adf9c9201baedc</md5file>
-<md5file name="deliveries.lang">d9f0c52c0880cd2a167ea745276e7d34</md5file>
-<md5file name="mailmanspip.lang">f89420ea2cea158b44d851d13331691b</md5file>
-<md5file name="install.lang">71dcffbcc86f23f9cf452fba195be1d8</md5file>
-<md5file name="propal.lang">6699eb3eef6a6a05645ff11dd7646491</md5file>
-<md5file name="main.lang">028f2dff098e653e92a92e51a4d56f99</md5file>
-<md5file name="languages.lang">89bafed728ed1123e0a9884966bd38df</md5file>
-<md5file name="bookmarks.lang">354a01f32d385c5166d852822ad9d471</md5file>
-<md5file name="sms.lang">02e5e0d91e8cc1b008004845a60230d7</md5file>
-<md5file name="dict.lang">b86122de22bca131f7b1e591d0ad05d9</md5file>
-<md5file name="mails.lang">4b9ad2ca74ef4f33b05aafa6c8f5ee50</md5file>
-<md5file name="printipp.lang">1c203659d8fbe2117d8da349a757ad8e</md5file>
-<md5file name="other.lang">13de416181b3cdbebce2aedcba4778c6</md5file>
-<md5file name="commercial.lang">c4eae93fb414a18821379c3f61ce6e8a</md5file>
-<md5file name="salaries.lang">198738d85a77c59567f81577a6235b7a</md5file>
-<md5file name="trips.lang">476d5ab66502092cc71290f7b3a635a0</md5file>
-<md5file name="sendings.lang">d87251d2fa6e1c8d95ef7c0a2e21f6ff</md5file>
-<md5file name="accountancy.lang">07b06e9223c78d3d8156d51254b0fdd0</md5file>
-<md5file name="externalsite.lang">fb318dd514da9a7e91e4835a22a8b317</md5file>
-</dir>
-<dir name="/langs/uz_UZ" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">74617c4c134f60f3087c0b1f0451b538</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/en_GB" >
-<md5file name="bills.lang">503179eef2a75e444e6ed540ab5816af</md5file>
-<md5file name="admin.lang">3a63b5ca883378d2e5b3ffc0bd8367ba</md5file>
-<md5file name="products.lang">cf2e582534edc6a59ece7d22c939c00c</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="compta.lang">378e17fcf077672377ccbeef64dad311</md5file>
-<md5file name="main.lang">b2a770a6440bfa70194e2bed28f4d39e</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="accountancy.lang">db59948d8443a30f976ef562646c108e</md5file>
-</dir>
-<dir name="/langs/es_PY" >
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="companies.lang">86edd8b14802f697dde804a0b134a9f9</md5file>
-<md5file name="main.lang">47e41f42a075152d70958fe89cbf8d37</md5file>
-</dir>
-<dir name="/langs/zh_CN" >
-<md5file name="projects.lang">8c5cd3077f35b4d9a54fa1e2eaf99029</md5file>
-<md5file name="cashdesk.lang">37d8e465a4c969aeb37a190555547cd0</md5file>
-<md5file name="workflow.lang">f42d1bee9041dfc962483f895dc51516</md5file>
-<md5file name="bills.lang">e9df7e30e9fdbb6344a469b3ba149587</md5file>
-<md5file name="orders.lang">3a4b04e37555e1b591460bef9515a31d</md5file>
-<md5file name="admin.lang">6ce380aa4925459fd2018f1b969afac4</md5file>
-<md5file name="withdrawals.lang">e75dd31e0976099cfc0d9e00f9381947</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">03979b34915083ba410a0007c328ad2f</md5file>
-<md5file name="members.lang">7ef7a01bb8bfaa1bcf2a56e60d5dd02a</md5file>
-<md5file name="ecm.lang">35d341887139a758d99d30648927ee09</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">f15b010a942b145c786fa8acad689cb7</md5file>
-<md5file name="products.lang">25c26fad23173a7dbdec5924b8b1b004</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">751c73c02279b8c3741aa37bec82ba2c</md5file>
-<md5file name="agenda.lang">c247f188b836bd51267c422c407ae500</md5file>
-<md5file name="help.lang">9f8037a9a12a3775f77152459d1d56eb</md5file>
-<md5file name="holiday.lang">05728779c925f68cf37badeb98b828a8</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">0d9854420987f4e57f2b1f9d3c4aa726</md5file>
-<md5file name="categories.lang">109473a1938eb45b52bd3826fb672d9d</md5file>
-<md5file name="paybox.lang">f1a79c9a55705140a6d893b3690085d0</md5file>
-<md5file name="ldap.lang">8533867c20217e5aeae7d0dac180cd11</md5file>
-<md5file name="users.lang">580097c19dd53748b11f75fd6daa95d5</md5file>
-<md5file name="companies.lang">0f68c23818e6bc4499f54ac914e4282f</md5file>
-<md5file name="margins.lang">7a64d641a544fce0c38f713f0664d193</md5file>
-<md5file name="ftp.lang">f511f6074269da3134eed7e12c84de03</md5file>
-<md5file name="exports.lang">798688bb6771a235f9f222336ce5f4ba</md5file>
-<md5file name="paypal.lang">2c27edeee3a6e7883ed719fe44d6d145</md5file>
-<md5file name="cron.lang">a47439737e5532545747c6f73d6b90cd</md5file>
-<md5file name="interventions.lang">b83baa83e617bf718a588fb2e026aa49</md5file>
-<md5file name="errors.lang">40304c1f3cff2f503ecd99a6ac503613</md5file>
-<md5file name="compta.lang">af7f6ae4b129a71eab154f67ec4f9d59</md5file>
-<md5file name="suppliers.lang">9d81ac794e19939a076c93c618837b30</md5file>
-<md5file name="opensurvey.lang">791d08fbdcfe6f2029c0c400d4f3778f</md5file>
-<md5file name="donations.lang">af08cb31c426c69cee3d5be5dc8702c9</md5file>
-<md5file name="contracts.lang">5545078e333f5fa834e187b6d571738a</md5file>
-<md5file name="deliveries.lang">1364b5c7f6f46e8a9d5fe21a4aa0b8fe</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">a6798cd4ef3ea5a0028b7e33867373d0</md5file>
-<md5file name="propal.lang">095b99ae7775132e9700de77b2e6f898</md5file>
-<md5file name="main.lang">27f2d10ac233068065707bb949750e31</md5file>
-<md5file name="languages.lang">f56bdc64d89a098500278cca09fa304d</md5file>
-<md5file name="bookmarks.lang">a2ae9917403521ede786d9e643a53439</md5file>
-<md5file name="sms.lang">abfff4dbeb6fb2a25396303105f5642a</md5file>
-<md5file name="dict.lang">ecc8a0bde690b00e0836ea7764a2fb4c</md5file>
-<md5file name="mails.lang">b8ba3ac8ef64a7f87b2ef55a8bbd2f88</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">1643632ef5c00e55e35976ce7946fd81</md5file>
-<md5file name="commercial.lang">29a0ae9a5d2ca8e061d578be28de93b3</md5file>
-<md5file name="salaries.lang">7f54f89d0966306d4f60a669e23b402a</md5file>
-<md5file name="trips.lang">07edba7de542d83b61a622e33d5a25f6</md5file>
-<md5file name="sendings.lang">57c2154f2836596753680dff1c63f6e7</md5file>
-<md5file name="accountancy.lang">977750e7a21659d6215e7f843e69c058</md5file>
-<md5file name="externalsite.lang">7e2d917c34973b82cd21c55635057d46</md5file>
-</dir>
-<dir name="/langs/pl_PL" >
-<md5file name="projects.lang">bc93932dfa364d57694b5107bd221965</md5file>
-<md5file name="cashdesk.lang">15df5a3b4ebb165f9986273c4ebe8798</md5file>
-<md5file name="workflow.lang">d91271f2eee42c07a5138547a0f6c091</md5file>
-<md5file name="bills.lang">534aad3e7ff4b4e2fd40ad24338e359e</md5file>
-<md5file name="orders.lang">cc477bf80635d2022a70f38dcac5b6e1</md5file>
-<md5file name="admin.lang">91a570ab57e4e0ac714cf48c40e8e323</md5file>
-<md5file name="withdrawals.lang">e2f570e2e66df747bf8f6b3db227bdeb</md5file>
-<md5file name="incoterm.lang">642b1d3edd6abf2fdfaf30d3995d3f4d</md5file>
-<md5file name="loan.lang">a313c383e151fb72d0eaad1757188000</md5file>
-<md5file name="boxes.lang">7d8c8e9bc16ad8accad451a2a6c5a046</md5file>
-<md5file name="members.lang">716fac49d69b624c15ac9c91f370187c</md5file>
-<md5file name="ecm.lang">32ae8012fb080e21bffa6e556916d602</md5file>
-<md5file name="link.lang">c2211488a1337a74d003a9ddb3873a31</md5file>
-<md5file name="stocks.lang">270b61424746a236c6ada6678eb0a344</md5file>
-<md5file name="products.lang">ddb2d71f37194b210d54203f580211e6</md5file>
-<md5file name="printing.lang">5460d3ff345466ce89636dbeae2a34fd</md5file>
-<md5file name="banks.lang">dcda5413c3dc3ef55f5b843256bdaaa2</md5file>
-<md5file name="agenda.lang">fdfc437c24ae7b6ca2b931569363aa35</md5file>
-<md5file name="help.lang">ebf4f23c07bb09dca7337a86991819fe</md5file>
-<md5file name="holiday.lang">d005f2b3d8abdd71761243ac5bce19cb</md5file>
-<md5file name="productbatch.lang">1856c76dda9f60666256d04b1f964000</md5file>
-<md5file name="resource.lang">fffe909199241a85bd97495f34b80378</md5file>
-<md5file name="categories.lang">e8af2be464edfcb655c37b7915b678ef</md5file>
-<md5file name="paybox.lang">b86448d50cb02dcfafee6f9723c1dcc3</md5file>
-<md5file name="ldap.lang">3ab7d54a87b3c68cb046ebb54eefd70c</md5file>
-<md5file name="users.lang">a63ab8aee2fbc9a1107042a070b1716a</md5file>
-<md5file name="companies.lang">5d9c6213e92a9c18858795ff00848db6</md5file>
-<md5file name="margins.lang">2a5b90cb833fa873670d7322eb4eabef</md5file>
-<md5file name="ftp.lang">152fb2933996d8803475656021ee1adb</md5file>
-<md5file name="exports.lang">d1312f31922c4819a5582de37d0e05a9</md5file>
-<md5file name="paypal.lang">817b0ca846a290585a5395b65a65d68f</md5file>
-<md5file name="cron.lang">24216c82e991c6828e21333d95b808cf</md5file>
-<md5file name="interventions.lang">7b522a98d7a900c03121f5c35d905d84</md5file>
-<md5file name="errors.lang">f5e34703342979377ef0c6e0d12d5299</md5file>
-<md5file name="compta.lang">236e91cfdc41d006da0b3f67e78ac64b</md5file>
-<md5file name="suppliers.lang">2b48e1bf7846022de872d815250a7b05</md5file>
-<md5file name="opensurvey.lang">79da3afa1b6e18f33269de3e58e20500</md5file>
-<md5file name="donations.lang">3199b9e77ad97d719d306bfd9fe1f5bc</md5file>
-<md5file name="contracts.lang">94ba7022b5a214208b24339a91e8b417</md5file>
-<md5file name="deliveries.lang">75025c0ce9c0230f5b2a777164d34624</md5file>
-<md5file name="mailmanspip.lang">78baf615e8d1c00a89cc8eda5229f342</md5file>
-<md5file name="install.lang">e1055159f7b283cb7468daf14a8684a1</md5file>
-<md5file name="propal.lang">c6fa5046b17fc49c8763a64a2190559e</md5file>
-<md5file name="main.lang">fc98a808ed9dd80c9d4c5091473b8a9d</md5file>
-<md5file name="languages.lang">d26a73cb7efe81080f769a3ef26e0f14</md5file>
-<md5file name="bookmarks.lang">70a872670c64c2f1bfba189669cf2899</md5file>
-<md5file name="sms.lang">441e0f2ccdbec200a6056f9fdc0c3c97</md5file>
-<md5file name="dict.lang">73eee42ab2bef0da14d9c3fa7e1f1e3e</md5file>
-<md5file name="mails.lang">c22d4eec9dcae667969c076fb09665bd</md5file>
-<md5file name="printipp.lang">593e777ba5389aeaa04f7da136a016a8</md5file>
-<md5file name="other.lang">d4d0f4abc5ee1340255a9eb0076cd961</md5file>
-<md5file name="commercial.lang">6eede0f730806bdb6752fface240ad8d</md5file>
-<md5file name="salaries.lang">e644544bcf0068e86a44d37c204ec963</md5file>
-<md5file name="trips.lang">4ab7bcf0d217d86468075ece0c83929d</md5file>
-<md5file name="sendings.lang">850f81668e8529bc785988b981aeb25a</md5file>
-<md5file name="accountancy.lang">dca08dfec11f90b90a5ffe1e4344e5ca</md5file>
-<md5file name="externalsite.lang">86d18225c3ec4d2ab47d5b96594e1d74</md5file>
-</dir>
-<dir name="/langs/es_CO" >
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="companies.lang">4a73b1420652c433015ba38d07a82126</md5file>
-<md5file name="main.lang">7e05aa55be140022b44bb77adef4c3d1</md5file>
-<md5file name="salaries.lang">9d0003b476b04cb18293d40e8e5f9e4b</md5file>
-<md5file name="externalsite.lang">efdb5a6169890e8d2250eac7fffe7942</md5file>
-</dir>
-<dir name="/langs/kn_IN" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">9cd49e7f744d8de62eba542e0195fdeb</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">34c7fde492170f80fe8e0e6434f3eb0b</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/de_AT" >
-<md5file name="projects.lang">3c1901d15b11b7c8d9411305c2c10e47</md5file>
-<md5file name="bills.lang">43f67ab455d8d7d37792adf1b07c5d9a</md5file>
-<md5file name="orders.lang">0f4cabd5c702824c0432a5b16dedf3ef</md5file>
-<md5file name="admin.lang">79d85b51749f47c08f869e8d88792b96</md5file>
-<md5file name="withdrawals.lang">e5be41a111cad12948b3c30fcd5a41c3</md5file>
-<md5file name="boxes.lang">f8c35e3878a1834751fd9ceaf8e6bb7d</md5file>
-<md5file name="members.lang">ed92d742de3415fde0de3efc2b84e990</md5file>
-<md5file name="ecm.lang">c1f61d4c7d7ddbfd6d0c3e00dfa7c91d</md5file>
-<md5file name="stocks.lang">467604093e3127dfaa5690fc4497f4a3</md5file>
-<md5file name="products.lang">3e40d8cdd27d56fa814cd97eaa6ab63f</md5file>
-<md5file name="banks.lang">616c29b85368aae480120bb30455f2e8</md5file>
-<md5file name="agenda.lang">d87b686508e12bb408c58888689211a2</md5file>
-<md5file name="help.lang">5e5684f776f1a7354578715682f38651</md5file>
-<md5file name="categories.lang">fedf292cca2809a18d78f474c1334447</md5file>
-<md5file name="paybox.lang">b1d9c0b57b93cd0b5584fab53a6c227d</md5file>
-<md5file name="ldap.lang">dcd4b0caa14caf886102e9aca04e8b7b</md5file>
-<md5file name="users.lang">8db88368767449b61ad48b02ca40d8b2</md5file>
-<md5file name="companies.lang">3d3d3620c656fde1ed4778a8d0ed23e0</md5file>
-<md5file name="exports.lang">48774123b922c982e9db9735f78cb033</md5file>
-<md5file name="paypal.lang">f47f15a53c307b7b6b14ce44989bc3e6</md5file>
-<md5file name="interventions.lang">7e99379d64b67784419dbe4472109e8a</md5file>
-<md5file name="errors.lang">f02aa204b8f08a2b24b5259e84d3ab65</md5file>
-<md5file name="compta.lang">5707af36b38fd6a63cc64e6852320ac9</md5file>
-<md5file name="suppliers.lang">d2a16e475bb3d3501ca097eccf16f3f5</md5file>
-<md5file name="contracts.lang">4a208b83b250a5fa06add548e5f4675f</md5file>
-<md5file name="deliveries.lang">82a6941cc4dc14b88f1053af0b499e4e</md5file>
-<md5file name="install.lang">59addea31dca998c1b712c1ed87d3f9d</md5file>
-<md5file name="propal.lang">ba8ea3ba48fae1c8c7bf1e4a44d31dd1</md5file>
-<md5file name="main.lang">380507f4784c904ee80136f10dc4c93a</md5file>
-<md5file name="languages.lang">85086256e7de8ee29545bcd5c1063a55</md5file>
-<md5file name="bookmarks.lang">5695f95ab75430e71ca7e91b1d4a7993</md5file>
-<md5file name="dict.lang">5df22313fdd1f6434b42a5a11f635460</md5file>
-<md5file name="mails.lang">6be938f89027df9edcc327a209f82408</md5file>
-<md5file name="other.lang">bcee8ecb596b1ac5d285632373182ef2</md5file>
-<md5file name="commercial.lang">b5ecca54092aecafd5a65dc0d95b9739</md5file>
-<md5file name="trips.lang">428baf81a8ef213be49b3f9096a78fbb</md5file>
-<md5file name="sendings.lang">e5dabc12813a485062ab5b77b5426679</md5file>
-</dir>
-<dir name="/langs/is_IS" >
-<md5file name="projects.lang">8f2df396846f56c36b7f5981c55b09af</md5file>
-<md5file name="cashdesk.lang">632d62425fd80b2ae185fb09da005b35</md5file>
-<md5file name="workflow.lang">41a82da1a38fdb0731f1af8f23e1b884</md5file>
-<md5file name="bills.lang">42bdbc393938fe75a1d853bf20f51164</md5file>
-<md5file name="orders.lang">e349f1a124686686a7e6e55d5e728e66</md5file>
-<md5file name="admin.lang">7c87dfe04f9013e7205e49361b771a8c</md5file>
-<md5file name="withdrawals.lang">36526b8dab4e59d4f4ad236d6c90907e</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">a46e84e226776d1c036b5c45cf3bebc9</md5file>
-<md5file name="members.lang">f760a8a4dbcb446b2b9d4a57519b97a3</md5file>
-<md5file name="ecm.lang">8586f1e6313f1760b3c4b35d5446662e</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">5b34db46dd8cb293738572404ed3b225</md5file>
-<md5file name="products.lang">bf649dc0dc28169978f52fadfd74c2ed</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">338c2613ad6cc390448329775b4d2468</md5file>
-<md5file name="agenda.lang">f0777bfe665957f9c9cebb90f151c62b</md5file>
-<md5file name="help.lang">49070aa4eba7e3e1b439d12caaee9952</md5file>
-<md5file name="holiday.lang">d11f46d9d4869fd71bcb552f8d51522f</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">d1d57eea51657033e41f1634e96c2560</md5file>
-<md5file name="paybox.lang">53ef803ac43a6382f578eb37280e612c</md5file>
-<md5file name="ldap.lang">83fef6c66e36ad20cb4fe764f9f68e06</md5file>
-<md5file name="users.lang">a4171eccf1d40752d26b29b5153b11b2</md5file>
-<md5file name="companies.lang">0c962e7cdb40d7dad2a747913d2fa93c</md5file>
-<md5file name="margins.lang">a80d982a5473732ba1961c022070788f</md5file>
-<md5file name="ftp.lang">87397eaf064ce70b2c5ee2f26a101eb9</md5file>
-<md5file name="exports.lang">054e37b9444d3500de55fb2873fd01ef</md5file>
-<md5file name="paypal.lang">a0057248da365d8652f6b193da290302</md5file>
-<md5file name="cron.lang">c12cf1d469986ba2dc003196939d366d</md5file>
-<md5file name="interventions.lang">a0b716a86724f2cde471e7dc5a99bc5b</md5file>
-<md5file name="errors.lang">55ec9a397c40c4bc20ab7a911bb56d65</md5file>
-<md5file name="compta.lang">decda49a23434f20a901c6c9582898e5</md5file>
-<md5file name="suppliers.lang">af5b7c3ff0f794fcf79548c1ec0cad94</md5file>
-<md5file name="opensurvey.lang">cd19eae6497fdab036c304d1de48166f</md5file>
-<md5file name="donations.lang">6a99d337f18961deee4388eb086941c2</md5file>
-<md5file name="contracts.lang">09294bbf65aa3b16330b0b16119474d5</md5file>
-<md5file name="deliveries.lang">306523293000765d47944a1d49176227</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">aecc83c5c5055247d60a4ad36fe5d27b</md5file>
-<md5file name="propal.lang">0266e81927355c5ace41047baab6f273</md5file>
-<md5file name="main.lang">00a227b4e7ea9b1ea5ebae93307cadf2</md5file>
-<md5file name="languages.lang">92fb47ee68846daa048091fde37e7fce</md5file>
-<md5file name="bookmarks.lang">dd0c0d28fc4a2ed9db92b4ba84a9a561</md5file>
-<md5file name="sms.lang">62412b0b947b92addce88be9b0d465c1</md5file>
-<md5file name="dict.lang">e3a663c28cda435414f95b1683b36d3e</md5file>
-<md5file name="mails.lang">7813b286e9266e76c7024ec1f4050afa</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">3fd95b45a7575151e66f338bed7928b2</md5file>
-<md5file name="commercial.lang">bae49d79ca27a5fd2c36ff08d4f9007e</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">a0c8b26b80f18f02804d0e01e64c031a</md5file>
-<md5file name="sendings.lang">436361c24dbbb8a017932053886910ed</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">96c57fcb231c8ac82ea65c0892a50555</md5file>
-</dir>
-<dir name="/langs/hu_HU" >
-<md5file name="projects.lang">41d78d8a65914f0ef18af000e6a63052</md5file>
-<md5file name="cashdesk.lang">150ef0a3188079477ca03d406201c48b</md5file>
-<md5file name="workflow.lang">046d11412aa0f261834b9ae1e91bac48</md5file>
-<md5file name="bills.lang">a4fc1d9078c00df5c8ca169878cb4dbd</md5file>
-<md5file name="orders.lang">868f7d6e16df1caad6ea1baff31016cb</md5file>
-<md5file name="admin.lang">28cced83490f2d718f9c1e2c61606266</md5file>
-<md5file name="withdrawals.lang">3cb79c768f575725f294e75ef620f846</md5file>
-<md5file name="incoterm.lang">a4c048ac4494e32101da4774e4d56102</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">4fabc8a6936621fc03a2dd32a9ba7531</md5file>
-<md5file name="members.lang">5f8b1d14fad5cda81df0c2d95fb0b9a6</md5file>
-<md5file name="ecm.lang">302723b8a8150728e2868ef843784434</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">ae976b8b3ceff8461a54f6440a533b23</md5file>
-<md5file name="products.lang">f62445c9c54f7bc3a3790331bc282c32</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">d2fdef24cece2f67b802f0ff0a9246d0</md5file>
-<md5file name="agenda.lang">a1e2fe9ace3039db5aedeb81476f34fd</md5file>
-<md5file name="help.lang">54ee3269dc7dc1a5ad6b8e105b6d1c4a</md5file>
-<md5file name="holiday.lang">2b456e7e028515f07a6887c35bf6ff11</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">0377bbaabc9f554edfd5252b8280b6ef</md5file>
-<md5file name="paybox.lang">fd4e96a1dfb6310eaf9ca8e3d5d1c03b</md5file>
-<md5file name="ldap.lang">d4a4ee924ffb170772d19d8fb868d8b5</md5file>
-<md5file name="users.lang">6189a60e665e8910cf6e08c7b8cb34e4</md5file>
-<md5file name="companies.lang">521554f32c542b54887e7b042fdce454</md5file>
-<md5file name="margins.lang">9b01fee9c9212da2f9f5d7388424cc9d</md5file>
-<md5file name="ftp.lang">6689a5cb779685d445bbedb7079f68f4</md5file>
-<md5file name="exports.lang">e3b584458fa916fc13d478c9d06d66b0</md5file>
-<md5file name="paypal.lang">5f249fd236d741add5cd1989e73a179e</md5file>
-<md5file name="cron.lang">ba76df4a1a0806f87e68830f08b4c334</md5file>
-<md5file name="interventions.lang">74d91a7555f00214e4fc66025c26e7c6</md5file>
-<md5file name="errors.lang">c99f08ea02baca67b2f7d3b53d831686</md5file>
-<md5file name="compta.lang">025679c597154f7ba721c6a2bdc0a376</md5file>
-<md5file name="suppliers.lang">3db9a24b9c05a584f57e76bf796775e8</md5file>
-<md5file name="opensurvey.lang">30af1f1daa6808bc69afab5eef6d8777</md5file>
-<md5file name="donations.lang">05295a96fc118adfbe34fed9ab5695cb</md5file>
-<md5file name="contracts.lang">0eb4171c9641b54f4b0e99d38ed774d1</md5file>
-<md5file name="deliveries.lang">e2590b64c46acd99b18bf01068bda97f</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">be1e2d4df3f16e6e724b6e8322e2e34e</md5file>
-<md5file name="propal.lang">b62965af8cd454ed73aa42db77882ce8</md5file>
-<md5file name="main.lang">6d806208ab89956ede6d771dd22caf33</md5file>
-<md5file name="languages.lang">18f85545aab45cfaaf39f9beb9170e19</md5file>
-<md5file name="bookmarks.lang">f11caf85f97048d91c71324fa554e8cf</md5file>
-<md5file name="sms.lang">d7076d1ba0b16124aa157994fdb7ec3e</md5file>
-<md5file name="dict.lang">c16ead4fa40f9b157f7c4f0ec8afefd5</md5file>
-<md5file name="mails.lang">4174a4faff345145b6fe6ff3f2aa337c</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">a12d05ba9afa3e112f945becb6fb8a04</md5file>
-<md5file name="commercial.lang">daaa4ac0bea287ae9b6df8b05f59cbc5</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">8bd26ffb64c2d28d90aefe0d30932b98</md5file>
-<md5file name="sendings.lang">c91758455ce161836aafe2a059dd9009</md5file>
-<md5file name="accountancy.lang">32b016e33ecde84463dde239f1b9edb8</md5file>
-<md5file name="externalsite.lang">ef990f1dec41193b1367ff9ff985ca67</md5file>
-</dir>
-<dir name="/langs/de_CH" >
-<md5file name="bills.lang">0b12f786acead1817589d807f26db930</md5file>
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="main.lang">93fc25faef2e4a631602c033427fd12b</md5file>
-</dir>
-<dir name="/langs/es_VE" >
-<md5file name="projects.lang">02f561f8057e8cadb399c18635e6d799</md5file>
-<md5file name="bills.lang">d635affc1ece9aea78418df8eeaa6315</md5file>
-<md5file name="incoterm.lang">a74186274ce78332973e48f79e3c21a2</md5file>
-<md5file name="printing.lang">22a4f8ef288cc8029481984e6ea2ac8b</md5file>
-<md5file name="companies.lang">090e9b99362f9653758ae819aff75512</md5file>
-<md5file name="margins.lang">5410dd2cdb6ca3af79ee9d2dfbe90ead</md5file>
-<md5file name="compta.lang">418697d8893dc092be6f18415df3efbd</md5file>
-<md5file name="main.lang">a1d25b7f08b331845b86c40c2ce5074f</md5file>
-<md5file name="bookmarks.lang">9eb5f6e1266870f5c28554b6722a995e</md5file>
-<md5file name="sms.lang">7b57014d652d44232899ffaf1894e8ac</md5file>
-<md5file name="commercial.lang">dad6705b5a32e68b107566565d958801</md5file>
-<md5file name="trips.lang">772d360cc224f9125941df93cb5c39c5</md5file>
-<md5file name="sendings.lang">1a11cd258abcd332148d1c2c08dcac6d</md5file>
-</dir>
-<dir name="/langs/id_ID" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">05639cd1f431af20d67cbb44362109f5</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6c2a478ad90eccc4dc58825b3955f8ea</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">3205d55a96cffd3b1b029104458ccbfe</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">e108d4f278f102da00319763761567e8</md5file>
-<md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">78851b6f8f660d86b00238d80980f375</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">17c25bcc2889cff3d487e3053feabbc9</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">485f95503bd19520f6ca020ae9f337db</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">161157a60b6d31aa2eb6787c8e5b6001</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">4364c1e5068618c97951cfab09ca12cc</md5file>
-<md5file name="languages.lang">cfd54dec6e531d2713c649687eb771cf</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
-<md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">34a1486eb36f6584c549680f7c8c5b65</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">fb4a6f0b8120de5bf4484b514147bf27</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">06712412e2918006f5ffb08e351cf4bc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/fr_BE" >
-<md5file name="bills.lang">11548ca929c3b33650644377a193fafa</md5file>
-<md5file name="admin.lang">d78f2f3c7cea8650f256384b115de5bd</md5file>
-<md5file name="boxes.lang">3332e7e07f91da6313b26cb61dbca6ee</md5file>
-<md5file name="agenda.lang">2cd37a211a31a13ce61875112cd9b50b</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="main.lang">6f99a2ec953cb62fbd44e00f8d7f1573</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="sms.lang">68459fc84ea935a6d7c3c01688685585</md5file>
-<md5file name="accountancy.lang">78ac41701d68b2929c5083654857ae83</md5file>
-</dir>
-<dir name="/langs/pt_PT" >
-<md5file name="projects.lang">b96ab3897fa257c512682880b7b78918</md5file>
-<md5file name="cashdesk.lang">8a54b70546ddfb4c37311eed7fe97f37</md5file>
-<md5file name="workflow.lang">5d4bc708b7463a1439b6e450ecfe14a4</md5file>
-<md5file name="bills.lang">8dc2592780c57ff8e1844b9685952aad</md5file>
-<md5file name="orders.lang">10f30659042ecce2c07c210ac2194652</md5file>
-<md5file name="admin.lang">1e3c22aa2adfc5c06708acf0e4b7d3f0</md5file>
-<md5file name="withdrawals.lang">14a61298c64c7c9be5640d0c4e4fb421</md5file>
-<md5file name="incoterm.lang">110e015c9a8e5ca0f74c16973fcfd6e6</md5file>
-<md5file name="loan.lang">fdec511a494d5027c2acfc28a9699401</md5file>
-<md5file name="boxes.lang">b724824ea94f4d3ab2ef94500dcfb952</md5file>
-<md5file name="members.lang">d2f5adfad0a886c9fd4f01bcd8e2b407</md5file>
-<md5file name="ecm.lang">4e5fa484c5e828a1850cdcc41c2e21ad</md5file>
-<md5file name="link.lang">e780b269169220334ce8a881ed8df86e</md5file>
-<md5file name="stocks.lang">8645e85dff01d97ec7a5592842fe8e9a</md5file>
-<md5file name="products.lang">785ac550d923a2372210f8ec6fdde91a</md5file>
-<md5file name="printing.lang">be34fcb006606de6d45c9017d0e6c0d0</md5file>
-<md5file name="banks.lang">6009271825117e12a5a0c602659cf797</md5file>
-<md5file name="agenda.lang">94d8e090abeb11d9024dcc7e3eb86871</md5file>
-<md5file name="help.lang">e131a7ffecf41104dee00ebbce281fab</md5file>
-<md5file name="holiday.lang">b52b425ac660948cac6079e24ad6fdab</md5file>
-<md5file name="productbatch.lang">d5878227c86ff4802e669af1c7596a5f</md5file>
-<md5file name="resource.lang">a1b4f1a132ee1c2910d45a3ddf0b116d</md5file>
-<md5file name="categories.lang">46696aca52e1960099b43cd82dbbc95d</md5file>
-<md5file name="paybox.lang">3004b16ebee23d327f659b2a7473435a</md5file>
-<md5file name="ldap.lang">184f8b89087e7c5bf304a8fb05056c81</md5file>
-<md5file name="users.lang">907459d92ccbbbeb7cedf07b093bab8d</md5file>
-<md5file name="companies.lang">283d11015b1e9abf93cf98db0ac9973a</md5file>
-<md5file name="margins.lang">88b274f352239ce9434388ff31bcf56e</md5file>
-<md5file name="ftp.lang">abee0268a8e107361ff47312a5e87a6d</md5file>
-<md5file name="exports.lang">ce77e314a51b996a81e15c9446978458</md5file>
-<md5file name="paypal.lang">953b6481373f49567196fa44c135b46e</md5file>
-<md5file name="cron.lang">c628021e320e7a63491f3bface328003</md5file>
-<md5file name="interventions.lang">5c2e760538e1597f18d4c7743b92dd27</md5file>
-<md5file name="errors.lang">fe1811d2f86bbbc548324f42cc4ed4aa</md5file>
-<md5file name="compta.lang">7558a825e0490735e28cab2de8014817</md5file>
-<md5file name="suppliers.lang">3678347d4536b92af9d398a603ec0aa9</md5file>
-<md5file name="opensurvey.lang">ac2e49c27102ae56b3deed5e8d7c4175</md5file>
-<md5file name="donations.lang">44f79429dad38940b566f2f1537df733</md5file>
-<md5file name="contracts.lang">47ec124cb943c866b2782fc3b47ef4a6</md5file>
-<md5file name="deliveries.lang">3a4777f67a135a1cfdf7a47069d350f0</md5file>
-<md5file name="mailmanspip.lang">1b7f4ed47e2733ed7daf1f068dc5a43a</md5file>
-<md5file name="install.lang">a15804da968df59a893dc273d4ab4c7e</md5file>
-<md5file name="propal.lang">dc01728427612699c305b8f285cd1262</md5file>
-<md5file name="main.lang">811b43fb9701e272813f4ce0f8dcdec2</md5file>
-<md5file name="languages.lang">19fc6c7a0821552c6a710175261e8d91</md5file>
-<md5file name="bookmarks.lang">87286fa247ed09647335fabb2a9ea2c8</md5file>
-<md5file name="sms.lang">0b44cc53b25de22d65ec652eb81f2709</md5file>
-<md5file name="dict.lang">f941b0dd2760b7fbc53b3ad0e10e50d7</md5file>
-<md5file name="mails.lang">8cc9786143f878d28bafc509c62ad272</md5file>
-<md5file name="printipp.lang">caff61b2f2d74c3b1224049158c71564</md5file>
-<md5file name="other.lang">529c0788b30ce0d497eef4017945ce2f</md5file>
-<md5file name="commercial.lang">172256717722c6365f96fe9ec964b9b4</md5file>
-<md5file name="salaries.lang">b75222a8f89443a5fdd5270fd5cb15bf</md5file>
-<md5file name="trips.lang">8ccf673ff2d8d21f4d4b27fe023b422a</md5file>
-<md5file name="sendings.lang">1560ee8237facda4df210cb12b9153e7</md5file>
-<md5file name="accountancy.lang">e7f841597d7e6fc358643b5bab47094c</md5file>
-<md5file name="externalsite.lang">6ad1e01b6d442e0d1300992628e095fa</md5file>
-</dir>
-<dir name="/langs/th_TH" >
-<md5file name="projects.lang">8204668d38a45472f4e6d12de692f2c0</md5file>
-<md5file name="cashdesk.lang">40da036c3ed6060360c70640de106608</md5file>
-<md5file name="workflow.lang">e79dbc779c33fba7f5c1a7a2f7b57bf8</md5file>
-<md5file name="bills.lang">9d450f24216624c693008f7e5f16e7b8</md5file>
-<md5file name="orders.lang">9c9c90168c862a478d6fea10cadbf68f</md5file>
-<md5file name="admin.lang">a471db266232d971a875494230cc7c48</md5file>
-<md5file name="withdrawals.lang">52427798b2a5dcb70d70d56d3e192716</md5file>
-<md5file name="incoterm.lang">1d053fd20fee7157bb530d6ed8656535</md5file>
-<md5file name="loan.lang">0b5a5f0f19db04cf9782504c32fde043</md5file>
-<md5file name="boxes.lang">bbd2e9eb5a38d949037f38c2b160f5e3</md5file>
-<md5file name="members.lang">ecfd8bb10368f489e38e4a6d70cf19f4</md5file>
-<md5file name="ecm.lang">14486d10d969cfb5063318a4d1fdf997</md5file>
-<md5file name="link.lang">bfdf26f7b6a89a2378f0c86830195f57</md5file>
-<md5file name="stocks.lang">be16e99465614871bf39a938b331739b</md5file>
-<md5file name="products.lang">48f087a382b785b2b48900bf02fda7de</md5file>
-<md5file name="printing.lang">3833a731abeca153bdb91e6ae155a90a</md5file>
-<md5file name="banks.lang">98d75e356fd2b8346ddce25d95e0ae71</md5file>
-<md5file name="agenda.lang">e9fc552212d3dcde62ce079b3ae7da14</md5file>
-<md5file name="help.lang">690c87d366aca89d2768a17c445cb045</md5file>
-<md5file name="holiday.lang">791e669d26928837be4fe2ef749411f3</md5file>
-<md5file name="productbatch.lang">0cd2d97cc04d767f61df46295f3689bf</md5file>
-<md5file name="resource.lang">b5685b4431db742c4d8e5eda463ac680</md5file>
-<md5file name="categories.lang">36ca80ebf0280ebf1d58db67f6491dda</md5file>
-<md5file name="paybox.lang">4cbbdb44f239d315bc124680b44e79a3</md5file>
-<md5file name="ldap.lang">f286f5bb77bf7a5d6a3133d47ca2def2</md5file>
-<md5file name="users.lang">4e48782ba5e3db06fe07b7a077ec5639</md5file>
-<md5file name="companies.lang">62e3883c35027c39bf1e314e7c24a570</md5file>
-<md5file name="margins.lang">09e9a424a7a3756529a6a9802317131b</md5file>
-<md5file name="ftp.lang">130c00d386078dace2cf9ff36b9f5c02</md5file>
-<md5file name="exports.lang">34b0430074749f12cff0ff3c6ffeb334</md5file>
-<md5file name="paypal.lang">819885d528aca06ddc71e73fc4f53c60</md5file>
-<md5file name="cron.lang">d95092bbd49344e2a07606621b38780f</md5file>
-<md5file name="interventions.lang">a24cf2d2bdde87993488aa5ac2311bde</md5file>
-<md5file name="errors.lang">058fd071b124431edbe806c875a55025</md5file>
-<md5file name="compta.lang">b1383da3b366596a1c0417fc06168e06</md5file>
-<md5file name="suppliers.lang">0a4b3147837c4b2697386b70940cd60d</md5file>
-<md5file name="opensurvey.lang">6c350cab97cc78a5355817fefdde8d1f</md5file>
-<md5file name="donations.lang">0102a1534d2964a0ff588ae23e2effb2</md5file>
-<md5file name="contracts.lang">3954cfb000ac4f676ed6fc06af23dacd</md5file>
-<md5file name="deliveries.lang">984ac2a148088665cbda36e3c2d1e226</md5file>
-<md5file name="mailmanspip.lang">84d22376b36901d38526d6ebe0e10281</md5file>
-<md5file name="install.lang">05be9a7471ce388b5e2e5fe2954b1424</md5file>
-<md5file name="propal.lang">65e9e1b5f51015b08fd5e36ee6766fe6</md5file>
-<md5file name="main.lang">ef25f47ee67eac94eeeb0dd9b5d569fb</md5file>
-<md5file name="languages.lang">9f783348297844ee23cb6f1cd01a212f</md5file>
-<md5file name="bookmarks.lang">89da70a234eae57c52a2c2c94993f02a</md5file>
-<md5file name="sms.lang">fc98abd696e8be5f5f266fc5a88e952c</md5file>
-<md5file name="dict.lang">ab4ecb5d3233c1e528042934ce93a740</md5file>
-<md5file name="mails.lang">0c0077efd9abc2c364cf48b04bd80bba</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">f4cf25203748b46f4380bb892d8e2075</md5file>
-<md5file name="commercial.lang">088147e15c8d95216dab10bdced092d5</md5file>
-<md5file name="salaries.lang">76fd170989412fcfb3cc9f0019c0f184</md5file>
-<md5file name="trips.lang">ea995e584eea2e034db3f28d8fd9bb6a</md5file>
-<md5file name="sendings.lang">1b0c0949ff8e57770f7e88e433b4deb3</md5file>
-<md5file name="accountancy.lang">75ef924e15af16ffa6eb2ccdf9d8ddf4</md5file>
-<md5file name="externalsite.lang">7457fe1789a9f0f07205824fb97aee9d</md5file>
-</dir>
-<dir name="/langs/ja_JP" >
-<md5file name="projects.lang">a025ed1d0dcf70880fb1c0c9afc6ac1d</md5file>
-<md5file name="cashdesk.lang">8c05bca341db9c1e806bf122cd6129b0</md5file>
-<md5file name="workflow.lang">f8f7a172a28516637112bfb05e9b0bbc</md5file>
-<md5file name="bills.lang">44ba92975e6660ad82e875ca2bf70c9b</md5file>
-<md5file name="orders.lang">443bd303b15816349244d32e532803f1</md5file>
-<md5file name="admin.lang">772113b2cf9a9a23788e28aaa3616e44</md5file>
-<md5file name="withdrawals.lang">4a9dd02753c248d33d39dea3efa7acd2</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">425da8d00f099c5e145c34080a297f90</md5file>
-<md5file name="members.lang">a4122ffd8f45e924d0008ac3b433753a</md5file>
-<md5file name="ecm.lang">be6f11bef46d99c22eb5966366c90559</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">c6596953a71008b40a07dbccc4246f00</md5file>
-<md5file name="products.lang">73a17ac88ca0270e05f2159971ea7d85</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">42caf35eadf47ce63212b7293613c26a</md5file>
-<md5file name="agenda.lang">901903fc1de65fc69091fd2329c420ce</md5file>
-<md5file name="help.lang">f5b0214673d66b795a0b2384d50a0f6e</md5file>
-<md5file name="holiday.lang">93f882d6f3b53b2356fcb729ac5a66b8</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">71069986b806fc1ff7a81389411f3758</md5file>
-<md5file name="paybox.lang">812a612df294643f768e53dedf53d8a8</md5file>
-<md5file name="ldap.lang">912352c3ea040bb64208b06524d3e69f</md5file>
-<md5file name="users.lang">59e6bc72bc79cb2058f3a3142ddbf65a</md5file>
-<md5file name="companies.lang">259c1b20b9f05320ec796e70839fc4f5</md5file>
-<md5file name="margins.lang">bec38e846ba9a13225c6530b1a282c4b</md5file>
-<md5file name="ftp.lang">c5df93c6c0e803924ce6e3768655ed6e</md5file>
-<md5file name="exports.lang">a8f1aa8e916a8bdc0840628322b2109d</md5file>
-<md5file name="paypal.lang">29274ab30398ff24199850dd8f263b78</md5file>
-<md5file name="cron.lang">91d7a4a1383f1b0fc2d3e378d46415fb</md5file>
-<md5file name="interventions.lang">b1cc8152608356ba4ba7f1391d54fbaf</md5file>
-<md5file name="errors.lang">ca7c24aefa1e07793edac9f3ddbe80d9</md5file>
-<md5file name="compta.lang">a5f494a9067158c4b81af693e44ca2f4</md5file>
-<md5file name="suppliers.lang">12ab9dfa0dd2b8b003da7ae04c38bb2c</md5file>
-<md5file name="opensurvey.lang">4c37f0937bc0bdf3829712cb5d05255c</md5file>
-<md5file name="donations.lang">096f70f880dc63e09b098ab89df0e483</md5file>
-<md5file name="contracts.lang">6178270f145f619a39ba9638617557b3</md5file>
-<md5file name="deliveries.lang">fa985871fb4d0f74795b3c61bf129d8d</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">b7b25caac3ac1481adcc45577b1fdb59</md5file>
-<md5file name="propal.lang">0df5c94ca0fefe23e45d64cfb4e3a943</md5file>
-<md5file name="main.lang">b25fa99e7044413d193297bd3909410f</md5file>
-<md5file name="languages.lang">8354a1df4b6e9dcfa5e89a6c44d82e2f</md5file>
-<md5file name="bookmarks.lang">c734b464a1378316c70ab63dd8a36e34</md5file>
-<md5file name="sms.lang">46f4fd2960c180e57bf42a4003b95789</md5file>
-<md5file name="dict.lang">d855926b2e6609fa7bce6078ee3fc9bf</md5file>
-<md5file name="mails.lang">d1926848c8d8c6315adce6f8ede4503a</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">f19eeee36029346ed958761cb617ed43</md5file>
-<md5file name="commercial.lang">0423f1a488a5a4b00d0d9624c1aeba96</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">e7c1d3a1b5e1cf7d3216cefaf1f2685d</md5file>
-<md5file name="sendings.lang">0d4ee93669987ff793623dda488a0cc9</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">e4fc2e43ec963c474b2f6f9ecccf3ea1</md5file>
-</dir>
-<dir name="/langs/ka_GE" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">34c7fde492170f80fe8e0e6434f3eb0b</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/sr_RS" >
-<md5file name="projects.lang">f8a9693752fbd4548c1ac8da7c8107be</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">445a46a82a229836e2a48281bfaab919</md5file>
-<md5file name="bills.lang">1d9a45779fc4c9ddca70d2112c570cd9</md5file>
-<md5file name="orders.lang">005ba3bd0008292e2a85386ddd1fa04f</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">e53cc4766956ee5ea80f16d007d510f6</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">4ac3174e1e2b105f8a57d7cb28a3d399</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">0f546518edb041564ac25ba94055b263</md5file>
-<md5file name="ecm.lang">8814f2d26ff511d967f395d57acd5685</md5file>
-<md5file name="link.lang">50168662e94e4db72ff2ed9dffcc4115</md5file>
-<md5file name="stocks.lang">3a925c7039a115c8e6ef0d90f31dff5f</md5file>
-<md5file name="products.lang">a1da5aff187e7e5b5f81bb9c2d661d5b</md5file>
-<md5file name="printing.lang">7c00b3d8a22adb8465d426fe5761fa35</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">d78ac4ef6dde0ad5fe7658f9d1ce627d</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">4a8c0a31962422325855a971a1c7710c</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">13f83052a3d8a7d4436fb7aaeb7913cf</md5file>
-<md5file name="ldap.lang">8b01757f2b296289c0f7db30ec11d96f</md5file>
-<md5file name="users.lang">59862f5cdca62471f71fcab151781df3</md5file>
-<md5file name="companies.lang">1e741510c30fa2894a498d766b788feb</md5file>
-<md5file name="margins.lang">9c64532d564956b7d3d3a257d242b3db</md5file>
-<md5file name="ftp.lang">b23badd5a8357651688c3f6df1316769</md5file>
-<md5file name="exports.lang">8b1c537db8ab0fe4c3f8927b2fb0cb9e</md5file>
-<md5file name="paypal.lang">54d6d201342c97b3711f80827d656538</md5file>
-<md5file name="cron.lang">9fbe301bd2b07340be501d7484824647</md5file>
-<md5file name="interventions.lang">a6c44b297a558b313b308619d0156073</md5file>
-<md5file name="errors.lang">119f3dc07f5def810e5ef2db590bc1b3</md5file>
-<md5file name="compta.lang">02f8d83c5adfb6d65ebf8b68fca9b672</md5file>
-<md5file name="suppliers.lang">218c313a6e7da245be69de66b962f49e</md5file>
-<md5file name="opensurvey.lang">cd47d93ba321bc08b38a92a265f6b3b0</md5file>
-<md5file name="donations.lang">2ed2a2b1bf98711b45ff827f312a4e7c</md5file>
-<md5file name="contracts.lang">60612a3459c02626f55f8d6d0d3402a2</md5file>
-<md5file name="deliveries.lang">2cd7d3f7497c93d075b5ccb792446c39</md5file>
-<md5file name="mailmanspip.lang">7757d7cb0a69e68eb61016da1eb117e5</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">dcbe961b1ff65aa4f20d45fedf7f134e</md5file>
-<md5file name="main.lang">f533529636168b23109deace45243288</md5file>
-<md5file name="languages.lang">5a95f66a1bae23db97588196ad92077a</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">e86011217ac83cd8b8952eba36da554f</md5file>
-<md5file name="dict.lang">291adbc7d79c325be982f0c0d155a12d</md5file>
-<md5file name="mails.lang">037be0b259ed6f2c8c88156f1287a353</md5file>
-<md5file name="other.lang">03cb1e67010459bfa029a017a1772908</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">b898ceb0904d8567be7de10c55a0729f</md5file>
-<md5file name="trips.lang">66e0502fccb30a28be66dd050968f0b2</md5file>
-<md5file name="sendings.lang">ac055953468913e48cf4428070d1db18</md5file>
-<md5file name="accountancy.lang">1483402c0b4004bb0547e572f2c6837d</md5file>
-<md5file name="externalsite.lang">6d68e6d9d94c46be0cc3db9e41e2f99d</md5file>
-</dir>
-<dir name="/langs/mk_MK" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">4364c1e5068618c97951cfab09ca12cc</md5file>
-<md5file name="languages.lang">3bb50d344204ac6115c3799e8e7d51ca</md5file>
-<md5file name="bookmarks.lang">0ad67108567f99662f7dabc9585331da</md5file>
-<md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
-<md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/vi_VN" >
-<md5file name="projects.lang">f58703fa42071506f754084771533803</md5file>
-<md5file name="cashdesk.lang">4f3dd930710082c606d630d8399cb483</md5file>
-<md5file name="workflow.lang">fe0cac1dcd26398b7af88d0463c11bf0</md5file>
-<md5file name="bills.lang">fca2cbd48c60d97608b0bd8dc7f72ffe</md5file>
-<md5file name="orders.lang">ef412501addaf9bc480e7de2bfb2d445</md5file>
-<md5file name="admin.lang">85241cbe975bbd8c97ddcdd93d5649c2</md5file>
-<md5file name="withdrawals.lang">24a463840569e7c31797c226dbca70d8</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">25e1ba7efdf7ca4514b81e86f1b0434e</md5file>
-<md5file name="boxes.lang">6830bc73f64c593602b0621587983a53</md5file>
-<md5file name="members.lang">f45ee6f7e075dc07091427a65d80bc3d</md5file>
-<md5file name="ecm.lang">de802721fcfbac64dba34c4e57db1d77</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">f224691cb7bcc2759a3892662c9db80e</md5file>
-<md5file name="products.lang">7993356c4b4d0e06e33e6aae2d86d338</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">5d07d2a675f1aee608bafb069211de4d</md5file>
-<md5file name="agenda.lang">004a58ead0e46cc37a0012f34830d7e9</md5file>
-<md5file name="help.lang">63a1a0c3dc2beff496d15938130fbc1e</md5file>
-<md5file name="holiday.lang">974a5c0861d9dbc8812376eb626d1252</md5file>
-<md5file name="productbatch.lang">2364fb2d06a0eb002e0053bbd30989b9</md5file>
-<md5file name="resource.lang">1b07213c7405612a72c82628826d7d5b</md5file>
-<md5file name="categories.lang">be187e899e7a47ffd467e9ce35b8f4cc</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">6b2bd775e06aa7cbd2f7a8848f5aba67</md5file>
-<md5file name="users.lang">992fdd617035a1127aba5caa02e9bf7b</md5file>
-<md5file name="companies.lang">42e733a579888b558a3e2469456ccbc2</md5file>
-<md5file name="margins.lang">6421a8b039e088359548c024a50070b9</md5file>
-<md5file name="ftp.lang">e54187fd82fe00c9c2271ba19d36c01c</md5file>
-<md5file name="exports.lang">1900a6121679c88999a0b9d2fdfcfd8a</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">ecbbb1603ab59fbe960202b3470413c5</md5file>
-<md5file name="interventions.lang">767dd7ba08cd361151b6d8390298a342</md5file>
-<md5file name="errors.lang">59d9c7c8cf2b1a6d3429e1ca7ff1a031</md5file>
-<md5file name="compta.lang">65c7492b9042f2489146986293c84674</md5file>
-<md5file name="suppliers.lang">e2bea3db3349c137767eab56bb706958</md5file>
-<md5file name="opensurvey.lang">aa04bdeb89f5b4ddbd80395ebe09c29a</md5file>
-<md5file name="donations.lang">7560df62010de03bd1597143b8909d9c</md5file>
-<md5file name="contracts.lang">501787b615deed8af323325510e4479c</md5file>
-<md5file name="deliveries.lang">2bb94b0f66048dd210f0b149544f69a3</md5file>
-<md5file name="mailmanspip.lang">999992f3bf87ecc74a951085c24ab54c</md5file>
-<md5file name="install.lang">70dc7c7ae05155db57ef2978e8c065c2</md5file>
-<md5file name="propal.lang">967f6c4724c7c5a3807ac81fd7d42d57</md5file>
-<md5file name="main.lang">c5e22bb5166a4b69d304414f519b359a</md5file>
-<md5file name="languages.lang">1eea27d8dc099de59fbd653e5bac258f</md5file>
-<md5file name="bookmarks.lang">3bdff0ea3ff709e917be270c3e96a1e9</md5file>
-<md5file name="sms.lang">c0ce2218241f69e739b177fd5c140033</md5file>
-<md5file name="dict.lang">9768913e4af639ec2118c264a5ca3583</md5file>
-<md5file name="mails.lang">0cb72b50f31e68c155adeb9c292092a9</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">42ae9991ee0b7209a3795196ab36c475</md5file>
-<md5file name="commercial.lang">0309f2f09248f3db096f6714de6a5e77</md5file>
-<md5file name="salaries.lang">1130ef43c1a7437b844db1579e3c434f</md5file>
-<md5file name="trips.lang">9544b3406665c8454ca7ab39e2a6393a</md5file>
-<md5file name="sendings.lang">ccd751e3f9c583aae56b1eefc3bafbbb</md5file>
-<md5file name="accountancy.lang">0545a8fe6b0d4712665045332c5a73fd</md5file>
-<md5file name="externalsite.lang">e77cfae1b2c9124ddd567cc6f0bcd7a9</md5file>
-</dir>
-<dir name="/langs/es_CL" >
-<md5file name="projects.lang">d04237165096c4ab4aae777ac08a63c1</md5file>
-<md5file name="workflow.lang">d644237a73e898a62393491905b4ed87</md5file>
-<md5file name="bills.lang">857cfdee8d1a70d9357f829ff7465ec3</md5file>
-<md5file name="orders.lang">b39c038e6e8b0628c90d5114271dc50e</md5file>
-<md5file name="admin.lang">8b1af0ee9bd757f406a9085e52cb3e1a</md5file>
-<md5file name="boxes.lang">18381fbfd3da6eb62195dd3d7c2025b5</md5file>
-<md5file name="members.lang">fab0071a1a02bdff2c962825b43c2dfd</md5file>
-<md5file name="ecm.lang">f254234f7743f533f091e707ae5c6e5a</md5file>
-<md5file name="products.lang">93d2324320ddf2609d33828f0070e552</md5file>
-<md5file name="agenda.lang">07dba3c5fa878727518a110582690996</md5file>
-<md5file name="companies.lang">169e53e9bb18aead3d080bed0fb9a311</md5file>
-<md5file name="compta.lang">721f864f34ed9957a1da79a505146c16</md5file>
-<md5file name="install.lang">f03b0dcf6c6febaec231650b079d2f69</md5file>
-<md5file name="propal.lang">0dcf4ac06cd149d2c5828b8563cbe01b</md5file>
-<md5file name="main.lang">436545df3d1465a5a48adb9868ac07a4</md5file>
-<md5file name="other.lang">d0e4982b7bc6a1cd62b339dd4edef863</md5file>
-<md5file name="commercial.lang">a946d614786a829d9964c0e27d143e0c</md5file>
-</dir>
-<dir name="/langs/fr_CA" >
-<md5file name="cashdesk.lang">08acb8a8ca3a1dd92759d583424913af</md5file>
-<md5file name="bills.lang">525957b57a0fc667d697fe991b9430d1</md5file>
-<md5file name="admin.lang">20bc5f32b32f8e0916ce1a5457227126</md5file>
-<md5file name="boxes.lang">86a67dc27f4eab8f63ed174e5c3b5d6b</md5file>
-<md5file name="banks.lang">7c997211d0f9484e255a5c00ee139c30</md5file>
-<md5file name="agenda.lang">ccce0cde4bf1a228f603f64e14dfd505</md5file>
-<md5file name="categories.lang">741a1338d8cd1eedcaa67bb2a3988c56</md5file>
-<md5file name="companies.lang">f698b9faa688684b6932c41c48845c65</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="compta.lang">73bfa19aad8a9d2f4456d5c6e05bc7aa</md5file>
-<md5file name="main.lang">c586c55023f5ff1cd37e7bf4795ac916</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="accountancy.lang">9ed2bf9282af9c376568885348569e87</md5file>
-</dir>
-<dir name="/langs/ru_UA" >
-<md5file name="ecm.lang">b9f82ae7cb411ea9546ce513e57af1f2</md5file>
-<md5file name="banks.lang">61e6b281614e6fbf49a582c4c3814561</md5file>
-<md5file name="paybox.lang">e87c1b421a5ebd90d2c4489335243122</md5file>
-<md5file name="ftp.lang">52f55c471841f57fc90e8cec05cff235</md5file>
-<md5file name="paypal.lang">770e2ab7f25b3e472aa802e6c28ec618</md5file>
-<md5file name="interventions.lang">1abdc7bdc807167558b363ad209cde6b</md5file>
-<md5file name="errors.lang">52617af5059503ff1f2e342f6f64b729</md5file>
-<md5file name="compta.lang">9a13db56e8d33a3225e5a034d45e1fa3</md5file>
-<md5file name="contracts.lang">da22bb2f6d31d3db27afa7f16d191297</md5file>
-<md5file name="install.lang">74774c6dd9b08148c7012fad3fc0c67f</md5file>
-<md5file name="main.lang">27a8a786b2726e4cccebef3cbcc38376</md5file>
-<md5file name="bookmarks.lang">784e8b81afaab9108514472162532414</md5file>
-<md5file name="dict.lang">826f390e791a08be2b7fb6bfe4df179b</md5file>
-<md5file name="mails.lang">dc464f0cc88ec03965837243ebaca8cc</md5file>
-<md5file name="other.lang">c2d7742f87130bde6c3b91332f04c837</md5file>
-</dir>
-<dir name="/langs/it_IT" >
-<md5file name="projects.lang">a2319b6bafdc046d8782498e721068df</md5file>
-<md5file name="cashdesk.lang">76391c0def140fedc6931ffbf18ab295</md5file>
-<md5file name="workflow.lang">4c6700b866e64fb8761e87c807f31801</md5file>
-<md5file name="bills.lang">2f5b0a47cdfe19b77022593d65a9ccb8</md5file>
-<md5file name="orders.lang">a75be484704fc95dcd1bd88579cdc6ac</md5file>
-<md5file name="admin.lang">85ba8085df5fa8598b2b64e97db1f12c</md5file>
-<md5file name="withdrawals.lang">93f3338fc21f2da47f79c1446f3f5da0</md5file>
-<md5file name="incoterm.lang">9a61b8f01d920877ac43574d7a89d139</md5file>
-<md5file name="loan.lang">0a27701667ce4d505e2ddbd6a16b8cc5</md5file>
-<md5file name="boxes.lang">8361914c0ee551857cc25cc0fdf97fe9</md5file>
-<md5file name="members.lang">d0aab202d384152857a67a5910d74da1</md5file>
-<md5file name="ecm.lang">7dd6c7b2a261d29947a77e876c528bb7</md5file>
-<md5file name="link.lang">b99ad87df98f3a06424fbd9ebd338e80</md5file>
-<md5file name="stocks.lang">5e43b0e94632b0f67f274968d54e1066</md5file>
-<md5file name="products.lang">79176c1d8bb3143c78f0830dd414f606</md5file>
-<md5file name="printing.lang">cc5a2dc3e5de619ff865e9d7c81e128a</md5file>
-<md5file name="banks.lang">fe7ed9ea8c32d40babb3bb89739b8880</md5file>
-<md5file name="agenda.lang">cf47d01f997d687b8a1bc38e0cb6485b</md5file>
-<md5file name="help.lang">31f372c93f03315c680f0ccf7d1df897</md5file>
-<md5file name="holiday.lang">b9731741850079b9e831f8a6890ec89b</md5file>
-<md5file name="productbatch.lang">254cc450c35f98ddf34271255f4eb6d9</md5file>
-<md5file name="resource.lang">22ec38a9e1c8d0a8ade2b378df4dfd5e</md5file>
-<md5file name="categories.lang">c679cf1cb4b8e13fa28a98eefa89e436</md5file>
-<md5file name="paybox.lang">caaf489a26511afefc97a0624f47f2e0</md5file>
-<md5file name="ldap.lang">e296aa7dae0e0d5d91a2a7cab148a042</md5file>
-<md5file name="users.lang">1c9f2e419e96a7abf36d46c2cde71e7a</md5file>
-<md5file name="companies.lang">e0e6e54c2cb89b008ee551ee9bd97804</md5file>
-<md5file name="margins.lang">24359d62453ef0883ebce7a118371c6a</md5file>
-<md5file name="ftp.lang">7512bb4a63889927a99524df2da76f7d</md5file>
-<md5file name="exports.lang">9cf7b617ca05a4066e7e0d5d02db6512</md5file>
-<md5file name="paypal.lang">bfdffc1cf6e42979f52384d3125b72ad</md5file>
-<md5file name="cron.lang">5136e39159be1875f8f6ba4489500d09</md5file>
-<md5file name="interventions.lang">05cf692312e366e5f262d956d0c11eca</md5file>
-<md5file name="errors.lang">70cd971784454b3e119e1d0e90d1de8a</md5file>
-<md5file name="compta.lang">24717a755baaf426eed7c691330616a4</md5file>
-<md5file name="suppliers.lang">45dbd2119c3d6fc009c327ef5510af98</md5file>
-<md5file name="opensurvey.lang">c7e70b20d22458e1c7625cde28fd7c3a</md5file>
-<md5file name="donations.lang">8847fd5eb933c577a1a58d65274df4fc</md5file>
-<md5file name="contracts.lang">26d9830c8d765010486530413e4827e6</md5file>
-<md5file name="deliveries.lang">ce9447e5187596bbbc50d0906cac35fb</md5file>
-<md5file name="mailmanspip.lang">c35de5bd5cec0c5e363104a2e2e4bef7</md5file>
-<md5file name="install.lang">7c452999b4237bc2856f5c3119ffed49</md5file>
-<md5file name="propal.lang">9af1f73d600a2a75987f983e3cfa6d1d</md5file>
-<md5file name="main.lang">afecc22449ba878a459caa37bef63609</md5file>
-<md5file name="languages.lang">21a333e51f000e1ff0aaeefc9312caf5</md5file>
-<md5file name="bookmarks.lang">17835e9b0f75e2f6dcc0345f888cdf4b</md5file>
-<md5file name="sms.lang">5d8da5928c310fe821026ff6eb52477f</md5file>
-<md5file name="dict.lang">50aa8753f776052cdf34c558afff98e3</md5file>
-<md5file name="mails.lang">a33b1202d3e3a42aedb57715dc2adc42</md5file>
-<md5file name="google.lang">8d5faf8e36b5e4b4da158ff2d6bd97e9</md5file>
-<md5file name="printipp.lang">208be53574c8852b95a50db6c755b89e</md5file>
-<md5file name="other.lang">578df63bdcf934610c0bbdb4f1c3f94c</md5file>
-<md5file name="commercial.lang">20c427de0090c8e9e4f9ac9682e7f120</md5file>
-<md5file name="salaries.lang">737511d96be3c80851cdd4018b27fd21</md5file>
-<md5file name="trips.lang">138735e3488e4289f0efaca31ebd99fb</md5file>
-<md5file name="sendings.lang">9860471a626d8cb68c4f882a84bc7bf3</md5file>
-<md5file name="accountancy.lang">275b46de50035e1d052d6f2798871d0f</md5file>
-<md5file name="externalsite.lang">3afb85eee792fc054a42df621767b520</md5file>
-</dir>
-<dir name="/langs/et_EE" >
-<md5file name="projects.lang">cad8ddff1d4ce01b74a4c89b39950974</md5file>
-<md5file name="cashdesk.lang">7cec430ac1104bd3b19e5890319c7fa9</md5file>
-<md5file name="workflow.lang">fdafaf7353ac65d8c09de8af2a8f3d02</md5file>
-<md5file name="bills.lang">c1381bf5be0a69e660a8520b87db5f21</md5file>
-<md5file name="orders.lang">f29476a4ccd176b6dcb06054bd905662</md5file>
-<md5file name="admin.lang">70ce0f35d14c6abfeaa210d3d1be0036</md5file>
-<md5file name="withdrawals.lang">38e0e2f17c3b5559b77b0f2406a3be1d</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">6b0bd777843664a8aa07dc3ff7c4e056</md5file>
-<md5file name="members.lang">af10bf1c20c1f623bbc427dffcf8d85d</md5file>
-<md5file name="ecm.lang">5d81b77669a8e33aedfb22e0a89257f3</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">6c946d22da24cf980129bca6e8dd85ed</md5file>
-<md5file name="products.lang">0c36ee899709c26ef7a38003fa609e23</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">743e2013f8b645af5a9affaaba23e2e7</md5file>
-<md5file name="agenda.lang">c89a0952620429ffc07402cf29cb6343</md5file>
-<md5file name="help.lang">db6c98d5d67b4033e5b2c0669a0defcb</md5file>
-<md5file name="holiday.lang">f7c72dc1b9159c90e8985a0b5023367f</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">98e462f88ab14c1a545de484f1b66166</md5file>
-<md5file name="paybox.lang">72ccc97c1267b7432a5a34838c729dbd</md5file>
-<md5file name="ldap.lang">8568e4d03cdcc1874f6f39e21f994007</md5file>
-<md5file name="users.lang">70b002fd1a16e5e9f19e1ca9c51797ba</md5file>
-<md5file name="companies.lang">a23db72fe18e54fba427eb4e66257e76</md5file>
-<md5file name="margins.lang">cc12ebdf72077be80525d64e6a7ed5ec</md5file>
-<md5file name="ftp.lang">7b3826dc0f092040df5f5356d8ff8e09</md5file>
-<md5file name="exports.lang">9193f8cbd4f4442768a02e8c54ca1fd2</md5file>
-<md5file name="paypal.lang">c101b90fd10577eafb85a1e9adb6c0a5</md5file>
-<md5file name="cron.lang">8c3a12722573cf513d5435feb7f71adf</md5file>
-<md5file name="interventions.lang">237f3ad73e2160a8b54aaf96262ab5c0</md5file>
-<md5file name="errors.lang">d9933cfcb7f8c7ccbc4bd7f0042f1e46</md5file>
-<md5file name="compta.lang">0fc0ed7a2924a23996079448796c537e</md5file>
-<md5file name="suppliers.lang">5940b1e0d9e4ef0693e6f862f1fca63c</md5file>
-<md5file name="opensurvey.lang">976e6f39654ffd979a1633da2107011e</md5file>
-<md5file name="donations.lang">7e73be5f5ef1f54d09eae743625e6e72</md5file>
-<md5file name="contracts.lang">23688a6549a080e528796537be16b9fc</md5file>
-<md5file name="deliveries.lang">2b39e01ef2d55c7b3a24671fcd570e59</md5file>
-<md5file name="mailmanspip.lang">0b5290b5856769452f96d8557ae4af4f</md5file>
-<md5file name="install.lang">135327918b1b40a9d85e0e11c22191a6</md5file>
-<md5file name="propal.lang">4de88dd01e059e9f95fa2110ae7f8009</md5file>
-<md5file name="main.lang">c5cefe593185d53e4916a9ebb1db00e4</md5file>
-<md5file name="languages.lang">d108704ee03b60d892f36b81181c0ff9</md5file>
-<md5file name="bookmarks.lang">eed8a78914dc69097046ef05aaefbc39</md5file>
-<md5file name="sms.lang">1f1976a8a42bad235f1ed009fbc606ff</md5file>
-<md5file name="dict.lang">4404ecf29a07974f4cf843216d86641c</md5file>
-<md5file name="mails.lang">493c788205c2f5743e9ba7d6e084f9c8</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">1c6a361487dcc57e627543fb69cf58b1</md5file>
-<md5file name="commercial.lang">37a149141ae55f1f1ec1f84529379e6a</md5file>
-<md5file name="salaries.lang">d0739d358ed00196d99144e88cdd7f7a</md5file>
-<md5file name="trips.lang">3e1b068f6c8c349c1deff0e88c8ca80a</md5file>
-<md5file name="sendings.lang">0e72f1e88211f93ee64eebbfe1564d1d</md5file>
-<md5file name="accountancy.lang">9d02a0c2396beed8f487a5dba939317d</md5file>
-<md5file name="externalsite.lang">1e261eaa004ceeffa908ff6569fc2119</md5file>
-</dir>
-<dir name="/langs/en_CA" >
-<md5file name="admin.lang">ba5ce4b6a48b32acfc7b42b719836cc8</md5file>
-<md5file name="companies.lang">8a6466c371e807254cad642d6f3d50b5</md5file>
-<md5file name="main.lang">cf97318c23bd26d18d237b60384ddc66</md5file>
-</dir>
-<dir name="/langs/cs_CZ" >
-<md5file name="projects.lang">e605ad7b957a19d8fe36c93fc33dccee</md5file>
-<md5file name="cashdesk.lang">5d320d584645765ff1a2708f271845f8</md5file>
-<md5file name="workflow.lang">2660b72b66426a56722e0907c756ae68</md5file>
-<md5file name="bills.lang">cdc6878c246cbc6b8f17ab2411979043</md5file>
-<md5file name="orders.lang">e83f4473fff2b4082532ad331f1b1f7b</md5file>
-<md5file name="admin.lang">a8b512f6071708646d9a300e34959efb</md5file>
-<md5file name="withdrawals.lang">bbd623fc654d0934ff37ed00c28de1a8</md5file>
-<md5file name="incoterm.lang">e25797bc9974d0b299076b48287420c6</md5file>
-<md5file name="loan.lang">771dd023b76d580a4e7da4a064ba3d0f</md5file>
-<md5file name="boxes.lang">fc033883d6d13c24d580e557ef1717ec</md5file>
-<md5file name="members.lang">ca07f1bf74a5f4a2b92039d15a99c224</md5file>
-<md5file name="ecm.lang">d08b34780ab4980ce0bb45d9130b6a7b</md5file>
-<md5file name="link.lang">151bf9e4c6174b12870e484fd6118b4e</md5file>
-<md5file name="stocks.lang">bf6cb3413093d75713ac70cf41034423</md5file>
-<md5file name="products.lang">60c087c4745633837a1cf463913f9a56</md5file>
-<md5file name="printing.lang">413e0555429b0e7292bedd1e52f4600c</md5file>
-<md5file name="banks.lang">233aed69397182ef49de87742d88bedf</md5file>
-<md5file name="agenda.lang">4d29fd256a903cb9fb12b7795385a7be</md5file>
-<md5file name="help.lang">ef3b8f2d379827209d56fbacb1dd0292</md5file>
-<md5file name="holiday.lang">59467fe98c12db57d65e60d1621c95cc</md5file>
-<md5file name="productbatch.lang">ba1cf48d1f6d031d8adf51752f179275</md5file>
-<md5file name="resource.lang">3646fd310e96bcd7ad15253c92d3d083</md5file>
-<md5file name="categories.lang">30d2ebfac928b67212840b7560e43f0c</md5file>
-<md5file name="paybox.lang">5a71ae000c909a6928a183bb4a2d941e</md5file>
-<md5file name="ldap.lang">db53803710393c0486f2e99c7029bfca</md5file>
-<md5file name="users.lang">390875fe099502f31e29c8772af30ef1</md5file>
-<md5file name="companies.lang">4dc2ed86e4551a07e4ff21e17d1a29aa</md5file>
-<md5file name="margins.lang">65a69690e67238c7a65cdae57faaf825</md5file>
-<md5file name="ftp.lang">415260e3759dc4f23f9926b7ba5b64b2</md5file>
-<md5file name="exports.lang">ba37223ce257f3662e2be96311962fce</md5file>
-<md5file name="paypal.lang">0eff879e0e50e8ce01972f38551cf1ea</md5file>
-<md5file name="cron.lang">6a52787b07ef94e8737e8d822bb0ecf1</md5file>
-<md5file name="interventions.lang">f27618bda8ad19e01c07c6f3db26d92b</md5file>
-<md5file name="errors.lang">7e3428d77f981288b2a3174809ec7ea4</md5file>
-<md5file name="compta.lang">d09bc0973279364ed47cdefa6a79c155</md5file>
-<md5file name="suppliers.lang">8f8a364b8d31313a165b00cba801409b</md5file>
-<md5file name="opensurvey.lang">4663e58b350137c5a7d311f08ab90d09</md5file>
-<md5file name="donations.lang">794c2d9924dbe3f2fe7679c7069eb5c8</md5file>
-<md5file name="contracts.lang">11af8e473e963199d9566b7b376b3050</md5file>
-<md5file name="deliveries.lang">622fe99e2e633f0d3e1b6184ff06b958</md5file>
-<md5file name="mailmanspip.lang">3f924c148e0c0f512570e1a1c65d81bf</md5file>
-<md5file name="install.lang">bfb6d02a7e828b4654cfc5cc18aa866d</md5file>
-<md5file name="propal.lang">2d2a97a666b366adedfcae6b76159247</md5file>
-<md5file name="main.lang">6802765991e1038ff058fe43a58ac024</md5file>
-<md5file name="languages.lang">e829de6a10c74866f41c0fd415c1edae</md5file>
-<md5file name="bookmarks.lang">4d96011de54501b073ca0dc8543778ff</md5file>
-<md5file name="sms.lang">0e1a650c3666abf86528bfd3562aa763</md5file>
-<md5file name="dict.lang">14497fd6edd5c6ff712f50e79dfc66d5</md5file>
-<md5file name="mails.lang">fbcc7e7e674e5af587e6dcbf42edfd1b</md5file>
-<md5file name="printipp.lang">c810c446eca7956f538556ac7ff10caa</md5file>
-<md5file name="other.lang">828d5c7956b6e0c17755342e38163ecb</md5file>
-<md5file name="commercial.lang">fcd6047c841ab6eb2f72f9614b28d6df</md5file>
-<md5file name="salaries.lang">062c2a7a4996394f673ca9d98ef3bf7f</md5file>
-<md5file name="trips.lang">05360e7849dce6f236187fadbeaae20f</md5file>
-<md5file name="sendings.lang">42432835fda1f793609eaca22b834d19</md5file>
-<md5file name="accountancy.lang">ad6aac2b4e1f77a3b57113392fe5c869</md5file>
-<md5file name="externalsite.lang">69e863de65c7c11b4d4359dd33933737</md5file>
-</dir>
-<dir name="/langs/es_AR" >
-<md5file name="admin.lang">a287d462bc71f579eea372c586ca1e65</md5file>
-<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-</dir>
-<dir name="/langs/en_AU" >
-<md5file name="bills.lang">503179eef2a75e444e6ed540ab5816af</md5file>
-<md5file name="admin.lang">3a63b5ca883378d2e5b3ffc0bd8367ba</md5file>
-<md5file name="withdrawals.lang">ab59d61bbffe26c3fdf53d3c6b5b05d9</md5file>
-<md5file name="products.lang">cf2e582534edc6a59ece7d22c939c00c</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="compta.lang">378e17fcf077672377ccbeef64dad311</md5file>
-<md5file name="main.lang">b2ee3e61485fdeb685fc7f73bf802b23</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="accountancy.lang">db59948d8443a30f976ef562646c108e</md5file>
-</dir>
-<dir name="/langs/sv_SE" >
-<md5file name="projects.lang">d9f9fec3917d6b53367053b70488dde9</md5file>
-<md5file name="cashdesk.lang">ac16b396be4bae4e72ddb087f590c2e2</md5file>
-<md5file name="workflow.lang">7634fa5841088e340e78dd026a207001</md5file>
-<md5file name="bills.lang">57092700792f07b4546c0943ebe8a1c4</md5file>
-<md5file name="orders.lang">53f1a80837a5b81364f828a9e284f4e2</md5file>
-<md5file name="admin.lang">93da2c233743613b21beb6dd691197ce</md5file>
-<md5file name="withdrawals.lang">f0bdb95e6126f2d5e550583f455f55d9</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">31a8687a8d2cbf8992c607e1f21e0a7d</md5file>
-<md5file name="boxes.lang">eef423b5c9410bec537cf0b8eaf84d33</md5file>
-<md5file name="members.lang">bf78ef45d31ebca84115e960baf244e7</md5file>
-<md5file name="ecm.lang">adf891c20d96e4184023d04552078088</md5file>
-<md5file name="link.lang">99d11807fc3d60ef8532b0dcb0e7566b</md5file>
-<md5file name="stocks.lang">ede3fa28a1d3a5680ef13c9e227b42ba</md5file>
-<md5file name="products.lang">18783aee3a3acd1e542de7cec9e576eb</md5file>
-<md5file name="printing.lang">c20563eb5ab144e4caac3d422a3f7a4c</md5file>
-<md5file name="banks.lang">9ed840b9544e41d2db4391c20dccd674</md5file>
-<md5file name="agenda.lang">eebc91d4fab1259c05415ed82cd19879</md5file>
-<md5file name="help.lang">007da2b3bc701f7be0efb50a99d72e98</md5file>
-<md5file name="holiday.lang">4086f5653c691655e505bc0fc5cc6481</md5file>
-<md5file name="productbatch.lang">97cf9622d28bae2a510eda4aecbe0319</md5file>
-<md5file name="resource.lang">d3988891f5f080e84de28bbfde083477</md5file>
-<md5file name="categories.lang">508ba851c0f230bfaa3c32b813d1fcd8</md5file>
-<md5file name="paybox.lang">979ec7bc5aa8684ffd8ff718bdeca9b0</md5file>
-<md5file name="ldap.lang">9f887891e44e6ccd4160a5863c49cc26</md5file>
-<md5file name="users.lang">9ef6d1074b9e0752a3622a84e8905b34</md5file>
-<md5file name="companies.lang">04c89392f04467d77eb2a2517bf57322</md5file>
-<md5file name="margins.lang">620efc55eb30835ab25b36b1f23c7290</md5file>
-<md5file name="ftp.lang">fbeea858e27c8b3de5a1c75afcc9c9bc</md5file>
-<md5file name="exports.lang">771c64d563aefc79aa6989565a94920f</md5file>
-<md5file name="paypal.lang">1099de7c892403a38bcb3f388002b114</md5file>
-<md5file name="cron.lang">a9bd45c8e4c6e67f48f99a56ef46b676</md5file>
-<md5file name="interventions.lang">1bbced61a157b36189a79c706f547db8</md5file>
-<md5file name="errors.lang">60dcaaf4d25545cc93de4a34c5958b25</md5file>
-<md5file name="compta.lang">be156233bfbb3efe91d096016210b107</md5file>
-<md5file name="suppliers.lang">bf0ffdd73c0e91aad6aa4e4b86f2f4a0</md5file>
-<md5file name="opensurvey.lang">0bd9d42b67a73a9b4df222e4245a5fcc</md5file>
-<md5file name="donations.lang">6ecb7391c7998ccbeca8f1209166c7e7</md5file>
-<md5file name="contracts.lang">090ad581e9e8c566eb52aaa42dc8fb72</md5file>
-<md5file name="deliveries.lang">3caeaa1071c0c238662aa44dd4e6ba7b</md5file>
-<md5file name="mailmanspip.lang">df6baaf86ed9f3d0e4b94c391d77f33f</md5file>
-<md5file name="install.lang">ca74ee128540b79d6796998342fc7312</md5file>
-<md5file name="propal.lang">a33b50027d330ad44adcd5e9e827bd42</md5file>
-<md5file name="main.lang">309cca9ee7dd88c3fd4f5442e19dea63</md5file>
-<md5file name="languages.lang">4bb861c191c93953e11e510fc40536c8</md5file>
-<md5file name="bookmarks.lang">677f664243cf071749383041adec0414</md5file>
-<md5file name="sms.lang">a14311660639a521042796c468a23b1d</md5file>
-<md5file name="dict.lang">17645bfcf4473c061cffa6613cc4626f</md5file>
-<md5file name="mails.lang">c85233e4f43ab8c971ffb9282bc4c4d3</md5file>
-<md5file name="printipp.lang">ceba8c6ff078ab8eb79134c5fbdf1ecf</md5file>
-<md5file name="other.lang">1cbabb1cf5ee731c28753634cc3dc7c6</md5file>
-<md5file name="commercial.lang">04551426a0aa4ed507140ac63f2e612a</md5file>
-<md5file name="salaries.lang">182eb0be249cd128f6aa5be40849afc0</md5file>
-<md5file name="trips.lang">defbcdd0247cab8d6f14fa0ae50220de</md5file>
-<md5file name="sendings.lang">936cad9093a2d6bced1c9bdd5a8c8f9a</md5file>
-<md5file name="accountancy.lang">762207d326766599a5862e6f616ee67b</md5file>
-<md5file name="externalsite.lang">2a02d65f7ee53f1a006212dd415343c4</md5file>
-</dir>
-<dir name="/langs/pt_BR" >
-<md5file name="projects.lang">5dd7d20f01960b03734721e766ba8100</md5file>
-<md5file name="cashdesk.lang">dc2cd95b6531d5b5cc7d52251523506a</md5file>
-<md5file name="workflow.lang">57282ab3ba26185cd568d1838e0ab8f3</md5file>
-<md5file name="bills.lang">d5f0a740213ba25091cf3f1cc4905229</md5file>
-<md5file name="orders.lang">826aba4abd3429ff665409aebda73e5e</md5file>
-<md5file name="admin.lang">ba85b46a82d3f8c4955e4043245e961a</md5file>
-<md5file name="withdrawals.lang">a094115816a8df0c006766c4000861c6</md5file>
-<md5file name="incoterm.lang">3e5ce3b248f7dda5c1eb88b75a642f5f</md5file>
-<md5file name="loan.lang">25088723418dcc167b4665c455714951</md5file>
-<md5file name="boxes.lang">c709b8fa6c5b39830e4e04919b52e4e9</md5file>
-<md5file name="members.lang">73007a2ccf83a6a27aee949e342a7345</md5file>
-<md5file name="ecm.lang">b05c8370bfbe8bc89c37c083624b5dff</md5file>
-<md5file name="link.lang">910620b9e594d851f1f8a1f286890aec</md5file>
-<md5file name="stocks.lang">601f004f8adb4995ee968e7a3c01b5df</md5file>
-<md5file name="products.lang">006f9f9a3aee411c145e072f21dea29d</md5file>
-<md5file name="printing.lang">6b93db41124ee6e53e738d483b6f87ad</md5file>
-<md5file name="banks.lang">7f8510d9f8d1ddce0364899ac4508960</md5file>
-<md5file name="agenda.lang">fe4355e5361957737c127212b9ab7777</md5file>
-<md5file name="help.lang">3509f62c9752bbac4f9bde2df2c7c8f0</md5file>
-<md5file name="holiday.lang">62e75f5e1fb98278a1126f706f0738be</md5file>
-<md5file name="productbatch.lang">20422b3e39bd1f7a977afcc1b14f3103</md5file>
-<md5file name="resource.lang">0a0f23a2b23ab6686de48bbba96bc1ce</md5file>
-<md5file name="categories.lang">27883e43e8af16b177867e0b22809805</md5file>
-<md5file name="paybox.lang">d7054e46baeb846c67f554fbaded072a</md5file>
-<md5file name="ldap.lang">3aeb0bb955d966af8406506605547e1c</md5file>
-<md5file name="users.lang">e7ac3efa7156fac7b187b4e2d3aa6b32</md5file>
-<md5file name="companies.lang">07fa6f601297cb41a1a6668d8a4137c1</md5file>
-<md5file name="margins.lang">90c202b94dcd09173f067e8bf5164b77</md5file>
-<md5file name="ftp.lang">4b3416e5ad27f1623f5c9222cf93f491</md5file>
-<md5file name="exports.lang">8b2e7f4dd5a2e5d494f167f6d0b38cc6</md5file>
-<md5file name="paypal.lang">6f11fdfa4b04669635edc07ca6efeca4</md5file>
-<md5file name="cron.lang">48a83412d06860f170a73a68d6d1d607</md5file>
-<md5file name="interventions.lang">5c3ad5663f3d6527148247ff7312b385</md5file>
-<md5file name="errors.lang">acca800c8cdc980d7fdccc5e9faf3e56</md5file>
-<md5file name="compta.lang">4f54e2cff46f1c74c68cf63780efb881</md5file>
-<md5file name="suppliers.lang">ea89357f6a833ce27bdaa3c633b73559</md5file>
-<md5file name="opensurvey.lang">838ea08d95f65f9a06957a7d066f0891</md5file>
-<md5file name="donations.lang">925e7c28144a75b7e0fbc57715f523f8</md5file>
-<md5file name="contracts.lang">b9e738744ff3a33a47ae67f529eead70</md5file>
-<md5file name="deliveries.lang">1db9e49d446f770d60dd8d133b654b4c</md5file>
-<md5file name="mailmanspip.lang">4941939fc3ea3906cfe30989e3c07431</md5file>
-<md5file name="install.lang">f804018f508887af815f81d054905620</md5file>
-<md5file name="propal.lang">6e9ac5f9954ea167f40c686de9be6b7b</md5file>
-<md5file name="main.lang">562889c108c03eb1b52e7c4819b3b125</md5file>
-<md5file name="languages.lang">0573bdbe1c4fa3214e77435e3bc64f9e</md5file>
-<md5file name="bookmarks.lang">285145b8adf6d1d7e53a1c102b25c177</md5file>
-<md5file name="sms.lang">673f3e0c4062e13cdef27b581fb66461</md5file>
-<md5file name="dict.lang">d74248250355b90443c5340490731dcf</md5file>
-<md5file name="mails.lang">cccf582b304132fe13245e9565ecdf91</md5file>
-<md5file name="printipp.lang">c554a1d2923d04978f3fe5cd245bba9a</md5file>
-<md5file name="other.lang">e4f036b504ab352e3bf58a912cea24bc</md5file>
-<md5file name="commercial.lang">5ca61a0d6b95a636b2949ae460e1d05c</md5file>
-<md5file name="salaries.lang">e0f4c93906c140661ee859581b1a168f</md5file>
-<md5file name="trips.lang">feb14dfc2c998cee54ba6247bb784862</md5file>
-<md5file name="sendings.lang">48ec52231c3493ab0344cba74e220a61</md5file>
-<md5file name="accountancy.lang">d8c806886f45ef4647f2dbd94e81a84a</md5file>
-<md5file name="externalsite.lang">e17ab7d7f81ddef4dc5e5ff071a5152c</md5file>
-</dir>
-<dir name="/langs/es_DO" >
-<md5file name="admin.lang">8e7647cbe7536c0a885439de89bf2d16</md5file>
-<md5file name="main.lang">9f5ba8d00d619d312d40c07f38b35c6e</md5file>
-</dir>
-<dir name="/langs/da_DK" >
-<md5file name="projects.lang">b2af4183c35c8368957a7e64377cc57f</md5file>
-<md5file name="cashdesk.lang">2da9b931d17ade2a435827c23455e872</md5file>
-<md5file name="workflow.lang">54f046768f3455e3fb35867c5b0f1ed7</md5file>
-<md5file name="bills.lang">579b992f766daae40b1605aeaadf619e</md5file>
-<md5file name="orders.lang">08e9fc5f52a0c53994887f92e1fcc44a</md5file>
-<md5file name="admin.lang">8bcd04bae3ad9c4f6d9643f29e9b498e</md5file>
-<md5file name="withdrawals.lang">c7888707a258ca1950680b39e80cd6eb</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">cd8e0a63a6201e157c9382e9ed179a09</md5file>
-<md5file name="members.lang">0c2770f61da58d89d7a3e470abcbde21</md5file>
-<md5file name="ecm.lang">56f667c49490cffec8ff2af43be01505</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">23b458105b635bbae85e8543b714f466</md5file>
-<md5file name="products.lang">ba86eb94b183aef4f2799ca2634ef9db</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">c27d3f95f804e12715a63ad998966bfe</md5file>
-<md5file name="agenda.lang">00031f18fd4104d1b3e39b63c3d6dc2e</md5file>
-<md5file name="help.lang">79089255158765aeec5fcef88335c136</md5file>
-<md5file name="holiday.lang">04b23547bf3a6201101e44f05cddb03b</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">2cd9e20c479aa18f908135af201a395d</md5file>
-<md5file name="paybox.lang">c949765e7e8fc39653e1d97d91d47b01</md5file>
-<md5file name="ldap.lang">7b38146af31c9a2d81c95b41efd3855a</md5file>
-<md5file name="users.lang">8eb7f101d38e1a354b316641fe4ad6e7</md5file>
-<md5file name="companies.lang">a8be8c5ca25dd947988ca9303c489275</md5file>
-<md5file name="margins.lang">5168ede7bbba74044a5a8745af74676e</md5file>
-<md5file name="ftp.lang">eddd90e362600b18430210de2678e89f</md5file>
-<md5file name="exports.lang">d8c0da3df4be8cf922d5ef2432d44c44</md5file>
-<md5file name="paypal.lang">19e47714f4bbb927bde7107edc730d9f</md5file>
-<md5file name="cron.lang">09fcf901f0bc76651c15015c36971ba6</md5file>
-<md5file name="interventions.lang">54796b8197ef6dfca9f7d998219c18a3</md5file>
-<md5file name="errors.lang">20be3b587e448c9e895c857eab0e43b0</md5file>
-<md5file name="compta.lang">af01e7f97733e4cc9f43563044dfa05d</md5file>
-<md5file name="suppliers.lang">ee8a076945ed7cb442619baa9be2442f</md5file>
-<md5file name="opensurvey.lang">15587334eaa9a54668859526ef2a173d</md5file>
-<md5file name="donations.lang">ae0b2989e0a8a56c8b4a3b9a77429586</md5file>
-<md5file name="contracts.lang">87fc4e5a3fa058627fed5ec8543bd51b</md5file>
-<md5file name="deliveries.lang">5c3fca1a0fe9b4eb6ffe3c9d9f8f7062</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">9fe1ac554c7c1de5066b3d7b81f22639</md5file>
-<md5file name="propal.lang">06d2f80c85c95fe57a57f846f411bae6</md5file>
-<md5file name="main.lang">6ca627368273e87b0d8e15e7545a160b</md5file>
-<md5file name="languages.lang">593da56badfaf10ce8795be74ed1ff79</md5file>
-<md5file name="bookmarks.lang">2be4d4a4c067b0e7d6abb9364ac01a7f</md5file>
-<md5file name="sms.lang">64d8c175fbdf22de3a58f0fe7a5d568d</md5file>
-<md5file name="dict.lang">64cbf57e30411b123cad22aecdec8857</md5file>
-<md5file name="mails.lang">d891e2b01301a0a48b054d06ec3fc777</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">b98b610f0ade06b2961c31ff32f6a5a0</md5file>
-<md5file name="commercial.lang">42f04c0dcc5624cf030f70eb6ac1380e</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">e0ba63b632488657acea03751b852a64</md5file>
-<md5file name="sendings.lang">c8ab1ce70a23df70ca4f14487cf22f69</md5file>
-<md5file name="accountancy.lang">28e1b5322211ded0107896817fe3011f</md5file>
-<md5file name="externalsite.lang">aae9d37af7193f531dd6b5ad8adadd3f</md5file>
-</dir>
-<dir name="/langs/nb_NO" >
-<md5file name="projects.lang">389aace5ef7e4ff0b68a58638c29bd20</md5file>
-<md5file name="cashdesk.lang">b62f02efdf9ac0a86c18a81908c92501</md5file>
-<md5file name="workflow.lang">eab69fb2035665be0d1a792c15829bec</md5file>
-<md5file name="bills.lang">831d40cba1c92e8bd28c98c34ce247b9</md5file>
-<md5file name="orders.lang">804ed0670b3482332fc7410c05f2f835</md5file>
-<md5file name="admin.lang">942ccaf3d1c8683ed112385b9b7cc2f6</md5file>
-<md5file name="withdrawals.lang">4692462d58a2fd80d42a987c7ea8aee2</md5file>
-<md5file name="incoterm.lang">d90e588833456a9940a42f86e8542454</md5file>
-<md5file name="loan.lang">d52c7d2657535ea3b294a12cabdf39f5</md5file>
-<md5file name="boxes.lang">9a0d9dd121a0bccb33e4928ea6f5c04b</md5file>
-<md5file name="members.lang">5adb21f679d4fcb748ca9c7ca58893ab</md5file>
-<md5file name="ecm.lang">f2aff6a51a5f3b1e5070d8296c0461bf</md5file>
-<md5file name="link.lang">9582f4b3d033986832619b97359d8201</md5file>
-<md5file name="stocks.lang">3da38f4ea86ed7257ddd3008e847ca93</md5file>
-<md5file name="products.lang">133dc348a86a495c2938ed78de122070</md5file>
-<md5file name="printing.lang">123a86fb0a51a6eb103794ccb2067ccd</md5file>
-<md5file name="banks.lang">410f30b698885f34c74e908963581a3f</md5file>
-<md5file name="agenda.lang">c632a366dcaa89159c561a5339552432</md5file>
-<md5file name="help.lang">2eda9af82d13ef3affd1c4942fd3472f</md5file>
-<md5file name="holiday.lang">f5bdf1242284d362828647ebd96dfba2</md5file>
-<md5file name="productbatch.lang">765bb7cd6ac5f4a20b68e8027c9b3885</md5file>
-<md5file name="resource.lang">f8f96ff7d44cbfc3936eb112c11a2462</md5file>
-<md5file name="categories.lang">df070d5cf97903c24e69d1b203cd6131</md5file>
-<md5file name="paybox.lang">c8d0d57fd5a8a90d3dfff59f1ff9c8ee</md5file>
-<md5file name="ldap.lang">3e3f45be57bcb65cafc6165966deafcf</md5file>
-<md5file name="users.lang">5fc61c1ea6a87f56d1e825e990ac0c3d</md5file>
-<md5file name="companies.lang">1c59494edcce7fa08fd90722764d58b8</md5file>
-<md5file name="margins.lang">fca9396ebf7b2d75dba9615adf461163</md5file>
-<md5file name="ftp.lang">b079e3a29f77815a5b9173c2feabb557</md5file>
-<md5file name="exports.lang">7ab6aba718d40a2d6a60c8afcff7b082</md5file>
-<md5file name="paypal.lang">02d605d8edf28de0d16ea863656a65db</md5file>
-<md5file name="cron.lang">371a05c7fd519e92e711b412705409ae</md5file>
-<md5file name="interventions.lang">0ca244d08e809687c9f7e79e279a84fc</md5file>
-<md5file name="errors.lang">c417682e9f6d01290365f42b78edc704</md5file>
-<md5file name="compta.lang">334a5d89c989883df00d10b86b384f9e</md5file>
-<md5file name="suppliers.lang">9b1fb82ce3b0aca36928900f127917af</md5file>
-<md5file name="opensurvey.lang">e7a5b910b574a29bc09a1396d1567d38</md5file>
-<md5file name="donations.lang">a6cb6f452563d756b01b256916a59348</md5file>
-<md5file name="contracts.lang">d91fc3113104d8ba67c51b2476661514</md5file>
-<md5file name="deliveries.lang">de4fc74e022f46aaf85ea0ffbb360a25</md5file>
-<md5file name="mailmanspip.lang">540b636ced7493d4b7ead20e7c43962e</md5file>
-<md5file name="install.lang">8ae01631961eb7a276be73a9051fd502</md5file>
-<md5file name="propal.lang">0d9a2bb9d65f21b755512afff479d8bc</md5file>
-<md5file name="main.lang">9a06edef2a49690033289089d6cd9b07</md5file>
-<md5file name="languages.lang">7960432eec8021e35327245eefc4fcb6</md5file>
-<md5file name="bookmarks.lang">13c5ddf75492c68962c91afab763ab5d</md5file>
-<md5file name="sms.lang">ab399d53ef38c91f15f5b8401f1919b2</md5file>
-<md5file name="dict.lang">ced9fbcf9c28efff2dd84d3b0de4f469</md5file>
-<md5file name="mails.lang">6cc343a1434a7c1ea38a90ca2f9a7c30</md5file>
-<md5file name="printipp.lang">414e0494ccd20f84c7fe6e6a1717a9d3</md5file>
-<md5file name="other.lang">5439979a35ceec0a2e4a491615e3b89f</md5file>
-<md5file name="commercial.lang">12a988c1312f99a6f713317bc02cb1aa</md5file>
-<md5file name="salaries.lang">9b0594e3a334ebd57337950e1374b48e</md5file>
-<md5file name="trips.lang">3260650c0ae93ef2b410b2c4d71511c2</md5file>
-<md5file name="sendings.lang">ea971260dafded2f5fe7aeb3f5ef5d26</md5file>
-<md5file name="accountancy.lang">30efed0e9ff5b5555b46115180371c5c</md5file>
-<md5file name="externalsite.lang">61d7d9b8502d45fb6dae1a0889effd14</md5file>
-</dir>
-<dir name="/langs/es_ES" >
-<md5file name="projects.lang">40451a6173526794176acb864c2fc4a0</md5file>
-<md5file name="cashdesk.lang">3262db34410c13ae4d777e263d779217</md5file>
-<md5file name="workflow.lang">31d65a4ce3cf788da72de88f7a6b2d06</md5file>
-<md5file name="bills.lang">05ae9f00f719f3aaef5bec5bd86853be</md5file>
-<md5file name="orders.lang">4dc3511b315c7d298a44c38ce7af2126</md5file>
-<md5file name="admin.lang">28d327e71731c909c076b309ec901332</md5file>
-<md5file name="withdrawals.lang">256de69b0185b8ac1e1164f52be30df4</md5file>
-<md5file name="incoterm.lang">7083dd601a0dd21afa5d5ffc09440d4a</md5file>
-<md5file name="loan.lang">5a302a8547e9d98cab90f51dc839a878</md5file>
-<md5file name="boxes.lang">151c5afe182c4e64644b1489449515a9</md5file>
-<md5file name="members.lang">78d057e8e8be68913e0cf967773afc71</md5file>
-<md5file name="ecm.lang">f5c8597db76285b1ade05d7d6bef6955</md5file>
-<md5file name="link.lang">94fecf363679c8ee6595eb087106921f</md5file>
-<md5file name="stocks.lang">d4adc458cbbf4ae1ae05b81bc08dc2d4</md5file>
-<md5file name="products.lang">cd56da9abe9272e55a18e1ff59dd4b25</md5file>
-<md5file name="printing.lang">7a6572951716b3e4ebee8fe54ffc4023</md5file>
-<md5file name="banks.lang">fc70bbf4fa6b1fa0bbb0335f779570b9</md5file>
-<md5file name="agenda.lang">a7181cacaf1235aefbc2b3aebf8047dd</md5file>
-<md5file name="help.lang">f5f165bb15c6391fc12ebac3e0a0f3e6</md5file>
-<md5file name="holiday.lang">8ee2efd2f7aa53ba65adea0a1946030a</md5file>
-<md5file name="productbatch.lang">40f20ba0e389d91edb8b29b71da6c2b2</md5file>
-<md5file name="resource.lang">7508982db7d5e9e5c7fec3f096de32b0</md5file>
-<md5file name="categories.lang">08209ad0a5c53c953fa64bcb29dacf90</md5file>
-<md5file name="paybox.lang">a083abb5e95590fe1cd60565bbadbfce</md5file>
-<md5file name="ldap.lang">769fa149d74c5645c53a89575a1cea0b</md5file>
-<md5file name="users.lang">dc02836368ba0678cfc7289e18edc4f3</md5file>
-<md5file name="companies.lang">ee618e253aedfa719a95d72dc404842d</md5file>
-<md5file name="margins.lang">0c4ca601c83dcfc8d0f4f45dc773e2f7</md5file>
-<md5file name="ftp.lang">012b10e345bcdc9dc702a284684fb2b7</md5file>
-<md5file name="exports.lang">e89ff63b9c6b27b12455800068bee19c</md5file>
-<md5file name="paypal.lang">10c2dcc555137e38039193ccedfc0cd3</md5file>
-<md5file name="cron.lang">bb194e9b127b46bb2271d19ed84603d3</md5file>
-<md5file name="interventions.lang">f54ac1724115231e8ade619a8782e374</md5file>
-<md5file name="errors.lang">b1432edb772d35f2950db364b6154bc8</md5file>
-<md5file name="compta.lang">95eb96950c687de257c61cc86bffd485</md5file>
-<md5file name="suppliers.lang">548bc532286b35f7a6ffee2a2801502a</md5file>
-<md5file name="opensurvey.lang">199dcc4ae427c0d0e5fbde6c0d2d2f99</md5file>
-<md5file name="donations.lang">1be19aee93ff0725138722e0b534e207</md5file>
-<md5file name="contracts.lang">df05fb48ea5f4eaf82df101331b39e84</md5file>
-<md5file name="deliveries.lang">8c8991fdd1f8a737640549006175fdce</md5file>
-<md5file name="mailmanspip.lang">db71e7656127c95fb902fc19efa94945</md5file>
-<md5file name="install.lang">28eabc15dba99547f5f302a46df90cc9</md5file>
-<md5file name="propal.lang">b19954c856288b7fba6053c64471aebe</md5file>
-<md5file name="main.lang">d1581462a134051a2b06e3a3e33f0f32</md5file>
-<md5file name="languages.lang">c76b5db17f8f117cfa0a3b045375090c</md5file>
-<md5file name="bookmarks.lang">a475fb087b707ca8fa0d87a0a7e38dbd</md5file>
-<md5file name="sms.lang">7c8a83bee9be22e875c81d9fd80097f5</md5file>
-<md5file name="dict.lang">5146388b914ad2a67ff419d124e12748</md5file>
-<md5file name="mails.lang">b8c18f933445fd71ce16eebb15efa13e</md5file>
-<md5file name="printipp.lang">c52a3fd956687b01a7767977926a155d</md5file>
-<md5file name="other.lang">148af0f1428d264b2c1b5bb22da8708b</md5file>
-<md5file name="commercial.lang">8f2a67e23c71638099040fdc6062609a</md5file>
-<md5file name="salaries.lang">739dcbdb1af7be20fde77fdb159f53a3</md5file>
-<md5file name="trips.lang">9a001cf479a5f9de7ecc25311cc65302</md5file>
-<md5file name="sendings.lang">056b4d4acab5eaf8f5b5cf2c568b1bcf</md5file>
-<md5file name="accountancy.lang">cb67a68604047b11312538d9a75423a1</md5file>
-<md5file name="externalsite.lang">87eae3bfbea127d8e90970cf3fe8a9a1</md5file>
-</dir>
-<dir name="/langs/fi_FI" >
-<md5file name="projects.lang">4cc9580e715a23e03ebd5d0d02f98ba1</md5file>
-<md5file name="cashdesk.lang">2495aaa5b99df2676b6409c322d2d2ef</md5file>
-<md5file name="workflow.lang">dc3e7510d95a4e41c33aaea7347f7cf2</md5file>
-<md5file name="bills.lang">32ac2d68b9657dd18e2b73929e5b9821</md5file>
-<md5file name="orders.lang">c4ee7398d07dbb57e9caddca4813a666</md5file>
-<md5file name="admin.lang">600e610c0502f431e628d73363f10970</md5file>
-<md5file name="withdrawals.lang">0221d29ac695e320aa365ec04ae2985c</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">0184a33f9c3389b35fcde8600ff95417</md5file>
-<md5file name="members.lang">8ff0acf9aba961d05e0715ccbbf04736</md5file>
-<md5file name="ecm.lang">dcae4e329492e2d99f0578f6e6c9397f</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">ee2fbf76bab8bb7fa64c3fb5c1f8da89</md5file>
-<md5file name="products.lang">5f7d5eb287f87b84a3b12b680a5b92be</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">28f31bee732a0bf5e12c489c08f70d28</md5file>
-<md5file name="agenda.lang">f27d3b01a2b69930de1169490ac21d39</md5file>
-<md5file name="help.lang">606ec4e8caaa77b3b8428f6d048ebdd8</md5file>
-<md5file name="holiday.lang">2185e7d1d2e0257c466077e8c32a91f9</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">84aa8a05ba6f4023339aa1fbb9a3eabc</md5file>
-<md5file name="paybox.lang">dd079ae8cedc46e35d279c27543a81be</md5file>
-<md5file name="ldap.lang">7709eb325cb2fc85c78639890ebd925c</md5file>
-<md5file name="users.lang">c668be265797094334ea182a0824494b</md5file>
-<md5file name="companies.lang">d7618ef878fcc5fb51bd88137dd4373e</md5file>
-<md5file name="margins.lang">cad19d84a46e0e9153e4a0fe0e6059a2</md5file>
-<md5file name="ftp.lang">78d542183f7dc43cf0ad4febaba14e80</md5file>
-<md5file name="exports.lang">76eb5e38af6ed0393868555475cf3a5f</md5file>
-<md5file name="paypal.lang">9af8cb14d88c4c8e0c58571545917dc1</md5file>
-<md5file name="cron.lang">a3be14202734967e6859f61f03850e47</md5file>
-<md5file name="interventions.lang">1270f8bc9bdb3cbd36ae2768d919fb3d</md5file>
-<md5file name="errors.lang">ee59ec630478e670eab50fbd61477bff</md5file>
-<md5file name="compta.lang">c4315f3f31f39fd6f395deddfc2e7f65</md5file>
-<md5file name="suppliers.lang">b0061480473128d4e3faacce851d5b5b</md5file>
-<md5file name="opensurvey.lang">ee23c6c8670ec36d43be842613bf1516</md5file>
-<md5file name="donations.lang">986d6c4908854449bc9ac2b008e75a7f</md5file>
-<md5file name="contracts.lang">83c16bd1d6727db3aaf2d25e72d37977</md5file>
-<md5file name="deliveries.lang">62f9203650557bc104780fcc7d9af944</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">a5bae1dd788536412dabc9981d316438</md5file>
-<md5file name="propal.lang">65cd279199c6ec5e320dedd7544c7a08</md5file>
-<md5file name="main.lang">fd7c096315d8e230f821458516443589</md5file>
-<md5file name="languages.lang">074c1fb786f0a605640392863724462a</md5file>
-<md5file name="bookmarks.lang">dee392760d4c24a3c7f6a9a218422148</md5file>
-<md5file name="sms.lang">4f3b5893f55d2462354b05f22afeeecc</md5file>
-<md5file name="dict.lang">74ca1c6583f0481aeafc21696c6df0b2</md5file>
-<md5file name="mails.lang">8acc527e4a123b7ff5e2cf88f55140c8</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">f894671ece4cd6cf3692362891a132f3</md5file>
-<md5file name="commercial.lang">b9a4206a2da2631381f180f1d17c22a1</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">4e561adb5b30f6f32722022523612456</md5file>
-<md5file name="sendings.lang">066cbbeeb72e13ce72244a35760d8e4f</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">8670dccfd7a31fa4c44bc8fffd978739</md5file>
-</dir>
-<dir name="/langs/es_PE" >
-<md5file name="bills.lang">36d54cc80744708ba9ec226b550c8daf</md5file>
-<md5file name="admin.lang">b445026a015b310e55204739eab1d577</md5file>
-<md5file name="companies.lang">921ab7227ed3abcda2db9bf141411751</md5file>
-<md5file name="compta.lang">2172e11a30b062324fc2a90d1f6de9b2</md5file>
-<md5file name="propal.lang">34ea25003f05ded5624df898f2c1ac4b</md5file>
-<md5file name="main.lang">7210212c531b08cb22055f395769fec4</md5file>
-</dir>
-<dir name="/langs/ar_SA" >
-<md5file name="projects.lang">3dcd7f6ebcb8c13721d94494608c85cb</md5file>
-<md5file name="cashdesk.lang">dd301d88f6d45a5b41cc61fd0398013d</md5file>
-<md5file name="workflow.lang">707db11ae318f0427fb4de517d7e73ec</md5file>
-<md5file name="bills.lang">37eecd1179765425b3c0ba7df71152db</md5file>
-<md5file name="orders.lang">bbc2657930596c2b154f00988ddcaedb</md5file>
-<md5file name="admin.lang">700cf29f7e2bf55c009cba529e1311d8</md5file>
-<md5file name="withdrawals.lang">e88891dab9672d1abf2a93d6083e18b6</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">f979dd15c52b991d1b7f7bebaf1904a9</md5file>
-<md5file name="members.lang">136b84df355623b8cde74d6e8f46a98d</md5file>
-<md5file name="ecm.lang">2b9513da76017124bddcbe355cde8b1b</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">f207e426d375d1a5fd4be856861f2a1a</md5file>
-<md5file name="products.lang">6adea116192ac7731c26d0c24346db9d</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">42c308614d57e7929e8831e861aaeb46</md5file>
-<md5file name="agenda.lang">a2efa498bb6ec2e917bc885ebe972a2d</md5file>
-<md5file name="help.lang">a53138e64ad08cc1eeccebf36b7ee960</md5file>
-<md5file name="holiday.lang">8678b550fc3e1b54584cb1fb8526c765</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">17d68c416413db1e496ad110d8a68bd8</md5file>
-<md5file name="paybox.lang">f2200cc41cb26e664754ccdad356e8b9</md5file>
-<md5file name="ldap.lang">c3fb35dd0fefe93bbf0dfd8976709bb7</md5file>
-<md5file name="users.lang">0f24e3f9b662529afcd2611dc32f47f7</md5file>
-<md5file name="companies.lang">28fcf85f29b6d66e69be37342b1ef2b9</md5file>
-<md5file name="margins.lang">97cdffb50afd0bd901cc9b4260e41f6c</md5file>
-<md5file name="ftp.lang">c320e189357c0a45b74d8a25de90857a</md5file>
-<md5file name="exports.lang">5352cf064fa3607504409fe7cc84472a</md5file>
-<md5file name="paypal.lang">3d9f9e874cfd7dc5eb4cb48ce2767545</md5file>
-<md5file name="cron.lang">ec324a67cb8145820e9ea896a36b29f9</md5file>
-<md5file name="interventions.lang">f721863a4725d02319ed4879dcf92263</md5file>
-<md5file name="errors.lang">c614918642df8a8819e1dd7edd49ddce</md5file>
-<md5file name="compta.lang">f757a92ab1bb8a7d9212b9164923cd01</md5file>
-<md5file name="suppliers.lang">8536e6609b02d26a3181678fa36d9761</md5file>
-<md5file name="opensurvey.lang">ba65eb70925e2e80ec40306484253483</md5file>
-<md5file name="donations.lang">eb7629f4b3e417ac96b46ea2457ff477</md5file>
-<md5file name="contracts.lang">90d13efe717f8457b7851bba57dd5a44</md5file>
-<md5file name="deliveries.lang">4b0317bacbf44db749d81e899c0d0540</md5file>
-<md5file name="mailmanspip.lang">1bc2c11dc61564329b6e8db3603fe42d</md5file>
-<md5file name="install.lang">ec37bf3f902eb3662495668553f89272</md5file>
-<md5file name="propal.lang">0aa68b2277a2af4acfa5e470260c4e0d</md5file>
-<md5file name="main.lang">527222ce739124433f5aca935f030d18</md5file>
-<md5file name="languages.lang">986e206bcc02718c3cd04e0095e62206</md5file>
-<md5file name="bookmarks.lang">aa3dd95196d0ec83718e74c22d0a0da3</md5file>
-<md5file name="sms.lang">7b3cd67f5f1c421536def5926d137a9d</md5file>
-<md5file name="dict.lang">ed7a4a7839b90c6a2abc4bda4006def1</md5file>
-<md5file name="mails.lang">b21bc1d1fa771c7e3e886c352fd73fb3</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">91325e5cb13290a437e5732dd7bd3bd1</md5file>
-<md5file name="commercial.lang">8a9f17adb34dc1f9e52e51bacdb9a5c4</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">14f0f8c0c9ce76174baabd31994fda59</md5file>
-<md5file name="sendings.lang">a9b8e7319dc463d1e2bc9d41dd80f1d5</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">9e65675700f44cd62f5ce4c4f3aa8226</md5file>
-</dir>
-<dir name="/langs/ru_RU" >
-<md5file name="projects.lang">90dd88c8b1fafe1a2b93f36e8219ae9e</md5file>
-<md5file name="cashdesk.lang">09e6a05a8cfe5f1533fe8144beb1d05b</md5file>
-<md5file name="workflow.lang">f423a14d136e03186e7f43e2df7c3744</md5file>
-<md5file name="bills.lang">4e5f5fa0ca8ec3a93d2061399c61e4e7</md5file>
-<md5file name="orders.lang">2a2912ece2fdf7a2e3c0c9ba78d3007d</md5file>
-<md5file name="admin.lang">272250f7b5f5f117598b5ad29775034a</md5file>
-<md5file name="withdrawals.lang">30f79908815a64fd943b8085d018e472</md5file>
-<md5file name="incoterm.lang">56abeea9ab436058834bac282558fd24</md5file>
-<md5file name="loan.lang">8fa599046396625428fddf3cccdc1bba</md5file>
-<md5file name="boxes.lang">fe22473d89990b28abe768719a9309d5</md5file>
-<md5file name="members.lang">16fb90752c058fa355caed219a1db6f4</md5file>
-<md5file name="ecm.lang">92f2d8f8299919cd0d2fe2ee8ddf6594</md5file>
-<md5file name="link.lang">52c74036b772b36f3da5b0f30cfd4feb</md5file>
-<md5file name="stocks.lang">7416a64dd5ed04c73228284cff4b6e0a</md5file>
-<md5file name="products.lang">185a78a293a14d6ffc849d6f91b63fe8</md5file>
-<md5file name="printing.lang">df0c9e9884678ca5fd289648f5d4af47</md5file>
-<md5file name="banks.lang">36027a7c1df765c78f8e9c2018881bb7</md5file>
-<md5file name="agenda.lang">d8880eb89d2c17dfd2040914d4b41bfe</md5file>
-<md5file name="help.lang">d99b7ed121c50b6b1cb0d9ccbc65bbc8</md5file>
-<md5file name="holiday.lang">4ebdd338fd8d79e60c7dc7a455854647</md5file>
-<md5file name="productbatch.lang">f5f46d2641ac2af573c70801a388a5b3</md5file>
-<md5file name="resource.lang">c5ffae12b8dbf993f93b82f81e07b7dc</md5file>
-<md5file name="categories.lang">5cd42f6767cdb4b451fc4f8e297dda01</md5file>
-<md5file name="paybox.lang">a593b69458210cb28c54e1d4b39ee75c</md5file>
-<md5file name="ldap.lang">0314cfeae04a5fe2c53b979688e15fe2</md5file>
-<md5file name="users.lang">dfb1bc2fafa4eef62911dae18a41f28c</md5file>
-<md5file name="companies.lang">9d9a893113bfa52b0e1e4434ea304f71</md5file>
-<md5file name="margins.lang">ba79d520b3293c9582b0646a29cf18d1</md5file>
-<md5file name="ftp.lang">ee204960e7c9e9f251a6f9c14af0bcaa</md5file>
-<md5file name="exports.lang">54e94d0a2c6da3464fc52793dd31a74b</md5file>
-<md5file name="paypal.lang">a3ec4dfec292f3fd441f5e5d3010c20f</md5file>
-<md5file name="cron.lang">c26a8142ff296d988cfe13332fb14bfc</md5file>
-<md5file name="interventions.lang">8181b7cc8039893c7db69f6e35adda51</md5file>
-<md5file name="errors.lang">e7baf0389ce6728637443d9962e57b83</md5file>
-<md5file name="compta.lang">99a72eb49507e17b6e1ac9a0239e9690</md5file>
-<md5file name="suppliers.lang">f7cc76455b53c9fb37c27554ed0967d0</md5file>
-<md5file name="opensurvey.lang">55d24007a85eb0d6649e589f8b7c2a69</md5file>
-<md5file name="donations.lang">351d775a3d652783a5d015060c47a446</md5file>
-<md5file name="contracts.lang">a5aff1132e18ab1546a154bcc75b3691</md5file>
-<md5file name="deliveries.lang">7ddff73aac78b8badf4bdba11cd541d2</md5file>
-<md5file name="mailmanspip.lang">7cbeff2cf852ffd059a2371bf23ec176</md5file>
-<md5file name="install.lang">695a5ee4a8341fd08dd10e8ee0c01237</md5file>
-<md5file name="propal.lang">b6600bbd673dc1a967e3d613935b691b</md5file>
-<md5file name="main.lang">0569afd539a3d7f7b99511cd179cc185</md5file>
-<md5file name="languages.lang">39bb4828de43b5f2a8155ce7395ffef7</md5file>
-<md5file name="bookmarks.lang">116c07ff8a67e2cdc94c62376e4290aa</md5file>
-<md5file name="sms.lang">da0fb653b20f60acb1b32e763c94ee84</md5file>
-<md5file name="dict.lang">8079141a1827f5d200d3df625684982d</md5file>
-<md5file name="mails.lang">edeab20ff1445be1465996f1a7541559</md5file>
-<md5file name="printipp.lang">4c5eea2a8145b886a2e8af4c13fdd8ec</md5file>
-<md5file name="other.lang">dba90846f4c60dad7507f8eb0a8c12b2</md5file>
-<md5file name="commercial.lang">78205956ea2e422bd0c3551470aaf917</md5file>
-<md5file name="salaries.lang">fab7ad4774c8821b32f59a87368821de</md5file>
-<md5file name="trips.lang">ce461eba9060cfd90008040553ae19d8</md5file>
-<md5file name="sendings.lang">c19f8ce8e5075509c5203a5344f42c37</md5file>
-<md5file name="accountancy.lang">8e77915c4597f8f884195e93997644d3</md5file>
-<md5file name="externalsite.lang">338d9c56e6653c910dac441e3a519d25</md5file>
-</dir>
-<dir name="/langs/bn_BD" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">6134c80e606fc3eeedd5bf6a39c3e77a</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">33f2afb3d4f651ff3a4856891f26faa3</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">74f49c52ba746096316a8fabfdd197cb</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">6448daf1b06217c7dc989bed6f3709a2</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">34c7fde492170f80fe8e0e6434f3eb0b</md5file>
-<md5file name="languages.lang">bdb86969718f38f7c3ec9d78b8708f02</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">228b0316d26bdd36e56a9158eea64ef6</md5file>
-<md5file name="dict.lang">59b195fcff4d3877045fee21c364d524</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/bg_BG" >
-<md5file name="projects.lang">5311f11bfb6f48d45b579989963be072</md5file>
-<md5file name="cashdesk.lang">cec5dc207fc9e4399548607def63b953</md5file>
-<md5file name="workflow.lang">481d05b63d8ecea12b14c26156a6f286</md5file>
-<md5file name="bills.lang">2c21e0cc9f70124dd60382c5849d9801</md5file>
-<md5file name="orders.lang">0117e9eb4ec62ae70cdc2cdb032ea4a3</md5file>
-<md5file name="admin.lang">b81b467bd411968fa82c2154930af428</md5file>
-<md5file name="withdrawals.lang">41cb1b4912e7e63055cc42cd34501683</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">7ad74748bcdbfa3f6d5fade21ad3abaf</md5file>
-<md5file name="members.lang">c97628c3391c9fa7f0628260d579799b</md5file>
-<md5file name="ecm.lang">32469a0fb52c4ff01ae369e67964bd6d</md5file>
-<md5file name="link.lang">32d4ac2fc85cd81163d3e5a3877c2c8b</md5file>
-<md5file name="stocks.lang">e0ec416c7a5ab7c6ec37f1451273a21a</md5file>
-<md5file name="products.lang">d5a61aae8249911d500db5a7b88576fe</md5file>
-<md5file name="printing.lang">081fb0fd1b55ff714d4779e63e4bea77</md5file>
-<md5file name="banks.lang">ff0350c1a83eb0d283c498b1b915b536</md5file>
-<md5file name="agenda.lang">d9b279a5b8b4444c22234eff94697dcb</md5file>
-<md5file name="help.lang">9a09d0e39657eaa250296b8b7e11a986</md5file>
-<md5file name="holiday.lang">1fcfd5d89b406c6248a629712866e053</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">1a2f787c54fbe6b561fbd776a25872fc</md5file>
-<md5file name="paybox.lang">3c474980a7bb1fd8a758009a01992640</md5file>
-<md5file name="ldap.lang">b5ac41b2d7993ff82acb9a8358a17202</md5file>
-<md5file name="users.lang">6177e3c17c2beae1066e42d26b0a921b</md5file>
-<md5file name="companies.lang">c47b778b31bbc39ddc2c933ad2788575</md5file>
-<md5file name="margins.lang">312e64c5493d745c91c4bf83e3eb0b01</md5file>
-<md5file name="ftp.lang">b4fa02045bdf797ca90cb154d0ec63fa</md5file>
-<md5file name="exports.lang">5f477631417f724965c004f9434cb18d</md5file>
-<md5file name="paypal.lang">57160d6901b4fe33370e429c4cb06aac</md5file>
-<md5file name="cron.lang">04b5877b7648ce36557698aa48eab05e</md5file>
-<md5file name="interventions.lang">ed7b0a314c45978c41f6c88b54c33268</md5file>
-<md5file name="errors.lang">70d3b934c48d4fc82f2fe8487b88399e</md5file>
-<md5file name="compta.lang">430c59370c4a7ef39ccaa467e99629b8</md5file>
-<md5file name="suppliers.lang">27eaeadcf2739876f33c94d429c8a19c</md5file>
-<md5file name="opensurvey.lang">1f2dfe32a45c0cc407b1e41483875c6d</md5file>
-<md5file name="donations.lang">889750973024b5b9ee80157128fdade9</md5file>
-<md5file name="contracts.lang">48a054998227d1b323709fd33f76506b</md5file>
-<md5file name="deliveries.lang">0b2ff41b32ddac3abfdd5615b520392d</md5file>
-<md5file name="mailmanspip.lang">4a64102233f5cc6a326d74c738ed1333</md5file>
-<md5file name="install.lang">1ff74927c61de2226faf161f47feaade</md5file>
-<md5file name="propal.lang">4f4e8ced4b1c098a97ac133e3cf16aba</md5file>
-<md5file name="main.lang">8d499dee22c1b0aa3bcf3aab7b562264</md5file>
-<md5file name="languages.lang">92d4b14e5af7fc2cd850f1fc26819501</md5file>
-<md5file name="bookmarks.lang">a2176e70d49f029e4ef345e258cabcd2</md5file>
-<md5file name="sms.lang">1ec82f780ad10ccf1017f53ad0a982fb</md5file>
-<md5file name="dict.lang">9a2353991fa9c9eb24f8a542ac8bd396</md5file>
-<md5file name="mails.lang">ade1ed2ca0e9fbd669f2e93bf489ace2</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">29b63a9f892720cd883ad2e1936fcc87</md5file>
-<md5file name="commercial.lang">fcf9a22383bc602b4753feb9f2e09129</md5file>
-<md5file name="salaries.lang">4468f3a8b5d7713027614c35c4edb4ba</md5file>
-<md5file name="trips.lang">ea657fdc5456475fabe2196f5599c26a</md5file>
-<md5file name="sendings.lang">627f0cb9b40a5cad12eb3fc54055e34a</md5file>
-<md5file name="accountancy.lang">d4847efca6fc5676a965a94360258c7a</md5file>
-<md5file name="externalsite.lang">ad72b32fa88b149015f6e9e0f8fd9411</md5file>
-</dir>
-<dir name="/langs/nl_NL" >
-<md5file name="projects.lang">fefdec042c8287c924f7d412433f0b12</md5file>
-<md5file name="cashdesk.lang">59c457c3403be06b525dd7b8c427701b</md5file>
-<md5file name="workflow.lang">d68cfe7e1c70fc21a50eab0606fb7ea5</md5file>
-<md5file name="bills.lang">97dc3ecc0046aed1ad5edd25b6b54373</md5file>
-<md5file name="orders.lang">826484beb032b1d93a3741e5607c7070</md5file>
-<md5file name="admin.lang">170a3447dec13b5255279d8f9cda7312</md5file>
-<md5file name="withdrawals.lang">2ac1903fa962c3d3b928b911581cf300</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">644d4340e8a233b2490f8f399a60bb16</md5file>
-<md5file name="members.lang">cbe4722c302b0de603f0a6786b191b85</md5file>
-<md5file name="ecm.lang">36b265e2c6ae9a266426658b4646578d</md5file>
-<md5file name="link.lang">8e5d65934184f09c60bab131b3eda509</md5file>
-<md5file name="stocks.lang">11321835cdb2fefd6e81e49b46e3a283</md5file>
-<md5file name="products.lang">8bb42b9d4a1756c1109ec7326c82c266</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">4c1b10958aeb625192a7a6c28536e16d</md5file>
-<md5file name="agenda.lang">75c36a756bdd4b4625cd7a68a6c9d496</md5file>
-<md5file name="help.lang">17eae49005c9eb8ec8aacd15dcf38b6b</md5file>
-<md5file name="holiday.lang">8db87c99c9359f086f6bf5bd9eac9827</md5file>
-<md5file name="productbatch.lang">8fd7ce4aeaf2b3be11f39bf9b2be332b</md5file>
-<md5file name="resource.lang">28de826c00f8408c18c1060cacc44808</md5file>
-<md5file name="categories.lang">015eef4f2ab821df5c61bc738def628f</md5file>
-<md5file name="paybox.lang">431b1b78a4a4fafd05d4e0bbc2c47263</md5file>
-<md5file name="ldap.lang">5bb64010fefff4ea7f80e1ab6a6e0122</md5file>
-<md5file name="users.lang">e6d541551ff358ea366fa5705aa03f33</md5file>
-<md5file name="companies.lang">c1d953128756a7da01bd104b2d8cb906</md5file>
-<md5file name="margins.lang">553f742a0252568f24b9cc15e948f336</md5file>
-<md5file name="ftp.lang">dca34b43d04a94d319bfa034c531af0f</md5file>
-<md5file name="exports.lang">4b48d7be1eea3640653b4b0dc5efe085</md5file>
-<md5file name="paypal.lang">fc591b6dcf00663001336aeb2459e123</md5file>
-<md5file name="cron.lang">539a0357c179e6ed2094b7ca1ebbc344</md5file>
-<md5file name="interventions.lang">340bd8239ef9566f005c8085593e2279</md5file>
-<md5file name="errors.lang">c0f772041db7e81650e2068587476450</md5file>
-<md5file name="compta.lang">789184f4b4eac3dd80414fd933797b37</md5file>
-<md5file name="suppliers.lang">ec4d6fe04de1980f496e9caf6fabe534</md5file>
-<md5file name="opensurvey.lang">0f18fd5af1f9ce788f5053e652842feb</md5file>
-<md5file name="donations.lang">bb7be4d52dba41ff906024591864300e</md5file>
-<md5file name="contracts.lang">4f3542ab71b20d7d28ae60817b2eb1d5</md5file>
-<md5file name="deliveries.lang">1d998745c1680fa335fed152b242cca5</md5file>
-<md5file name="mailmanspip.lang">a72a089766a7cf669f6b68270ce8f5ab</md5file>
-<md5file name="install.lang">7f8461bf7298a4f3b95a478054c892f3</md5file>
-<md5file name="propal.lang">4146dd4f46253b59caf76dc6970cfb61</md5file>
-<md5file name="main.lang">cdab51cc365677bff479257c690307ef</md5file>
-<md5file name="languages.lang">97b2d586afd72ce6439462b10716bee2</md5file>
-<md5file name="bookmarks.lang">4900f43900b2677888e3f7ec9a376c99</md5file>
-<md5file name="sms.lang">9c8629c3110dac7a00b21c554e869282</md5file>
-<md5file name="dict.lang">607e87ee590ab6b6e3c1f2017f310bb9</md5file>
-<md5file name="mails.lang">0c509a1ff62dd144392973d21f6f4c1f</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">0ed20acef7cc4de2c88ee482435f3ccd</md5file>
-<md5file name="commercial.lang">9d5d06d5343520f1f2bd5560833b3693</md5file>
-<md5file name="salaries.lang">b6786821a9641b2e90eb60d1cf955593</md5file>
-<md5file name="trips.lang">29567ae731d5a20740dadb635820c0d7</md5file>
-<md5file name="sendings.lang">83da48fa37c40e4f8c5ca323d585e7d9</md5file>
-<md5file name="accountancy.lang">d310d10dc4d402c846a3dda26c1fda13</md5file>
-<md5file name="externalsite.lang">1be24d68eebff59f8a3d55d1d248cdfb</md5file>
-</dir>
-<dir name="/langs/ko_KR" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">ff20e35d737a171fdebff3fffe219596</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">824ee00230cd20dd50324f22ad2344e8</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">8cd10e297876e0c2d47a576dfcf61a2b</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d4a0ea69d0b59441b8f0697456cc3140</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">a9abc615abd8dcb10635fb127bfd511b</md5file>
-<md5file name="help.lang">baf38b4ec10a43d12a333a1c2a28224f</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">2b8eee0e36e32de0279eb6f59fd579c7</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">8dbb1e2f5a1ef86eff3672cc4c3cb786</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">68633b9a396403744b2f3e762bbf5a19</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">8df081e6094878f0535027338dfafa8d</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">d4f924be5a1d7312869b4fc769fbe907</md5file>
-<md5file name="languages.lang">c621ae31c1038848045b5a54cdef80d1</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">d32aa2e1c7b5bd07001c90bc13dc7b50</md5file>
-<md5file name="dict.lang">6f225dc643f02ed2509b857ca08a1695</md5file>
-<md5file name="mails.lang">5ef140466400c96d5e5cbbdc7cacee28</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">a2b48c147b497f22bc9816616ca4cbd5</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/fr_FR" >
-<md5file name="projects.lang">a72601b36102fe74a5da294296ed25d6</md5file>
-<md5file name="cashdesk.lang">a7a17bad11811e39b0164573964f3c18</md5file>
-<md5file name="workflow.lang">3814711841ff79bfb1bffb653cfde0fb</md5file>
-<md5file name="bills.lang">a3b4d63e077d255c6cf6f57319b42cfa</md5file>
-<md5file name="orders.lang">40da93d7868af1bcee8c47d560dad545</md5file>
-<md5file name="admin.lang">484822ce4f486e645146a1be6dfa1c5f</md5file>
-<md5file name="withdrawals.lang">d7a12190e2704590b4523ba5b60dd6b6</md5file>
-<md5file name="incoterm.lang">d85c3718dd925b2f2749a6293f5cb8a6</md5file>
-<md5file name="loan.lang">6173cfe37fe100bca15d634b617e43ba</md5file>
-<md5file name="boxes.lang">3da2d86b46b9f04a99b688e4341d9750</md5file>
-<md5file name="members.lang">3394594b3b0fd3566c00254fbb89dc74</md5file>
-<md5file name="ecm.lang">407ba5abeaf3f08069464027cb52bbba</md5file>
-<md5file name="link.lang">7252bd36ac08f9518f548aa69d88fc86</md5file>
-<md5file name="stocks.lang">c314672849f4fb6754bc916bceaa7103</md5file>
-<md5file name="products.lang">af10d52e58cccf9ef9ec405040b3bc9e</md5file>
-<md5file name="printing.lang">baa8fc8768d82c06e62f9309cdcdd518</md5file>
-<md5file name="banks.lang">c7097dc5f0c9eadc72216ef7ab8dfea9</md5file>
-<md5file name="agenda.lang">870fc47eaef3c3972adde5908d4b582a</md5file>
-<md5file name="help.lang">b80c70a4104afbcdddb55fea9a09f703</md5file>
-<md5file name="holiday.lang">b2b79aa2d9b051ea649c131c5d7fc69c</md5file>
-<md5file name="productbatch.lang">1f454c455358e56662f3ddf5e1832a39</md5file>
-<md5file name="resource.lang">c336f582881f9f5ee8c96bbc8eaced3d</md5file>
-<md5file name="categories.lang">af051e192fdf402fc272d8f347236fc5</md5file>
-<md5file name="paybox.lang">fc4ad53fd61f746fe581f447bf76d79e</md5file>
-<md5file name="ldap.lang">70e166ce8c734b2c4b6215bef0875c3d</md5file>
-<md5file name="users.lang">93350f7c0359f3cff6c242f2e5924e3c</md5file>
-<md5file name="companies.lang">d33bcb7fbfa69a65c95e76933385907f</md5file>
-<md5file name="margins.lang">01f607491907d35587191c4fb9169462</md5file>
-<md5file name="ftp.lang">7c91aa49753eb42b22afa9cc2f91d373</md5file>
-<md5file name="exports.lang">48e94c383945bbd1041cf1374ab56358</md5file>
-<md5file name="paypal.lang">bcaf0ee7ee4ede4c0b11d33262e06913</md5file>
-<md5file name="cron.lang">4508eefc4cbf06183f780a47550b51fd</md5file>
-<md5file name="interventions.lang">421d8650975e65a657de36a0e89bd987</md5file>
-<md5file name="errors.lang">c9976744983ca5b3a00062185293abaf</md5file>
-<md5file name="compta.lang">d30e629b77caad35ab1bad4a4930bc94</md5file>
-<md5file name="suppliers.lang">307d48fb06eea97b2818146fbb8929cf</md5file>
-<md5file name="opensurvey.lang">bee0636e455ad5d9a8dcc288ac2abb4c</md5file>
-<md5file name="donations.lang">9875bc160f395b95a197ffbb4ac22190</md5file>
-<md5file name="contracts.lang">af0368dd00b10198d8770cabebd9e6ed</md5file>
-<md5file name="deliveries.lang">77def64e09174fe0ebc597e0e0f643da</md5file>
-<md5file name="mailmanspip.lang">7b075b656401153b43a2fe09321bcdf1</md5file>
-<md5file name="install.lang">f8c7c74a5a1f14cb6bfe57e7703379f2</md5file>
-<md5file name="propal.lang">fe7b10789faa1e33034ed5bea8a9520d</md5file>
-<md5file name="main.lang">791a1575c6fe5bbc51995bd299771d5e</md5file>
-<md5file name="languages.lang">fec9ffcbf2d43061cc0f2cd71d41260a</md5file>
-<md5file name="bookmarks.lang">2bac51be88c59c5ee21511836859e221</md5file>
-<md5file name="sms.lang">0889424a15f7ae4d5147e680d379e3c0</md5file>
-<md5file name="dict.lang">1da322fd765395f75d1bbd0857995779</md5file>
-<md5file name="mails.lang">699d8c5cf75a68b342647cee67c44485</md5file>
-<md5file name="printipp.lang">a1fe9c904ea0bd6d6ea490b977432ffc</md5file>
-<md5file name="other.lang">78c3ad1c535be023623d3560b843afcb</md5file>
-<md5file name="commercial.lang">8f7220da3aec4a4e3960715b2153411b</md5file>
-<md5file name="askpricesupplier.lang">89b6756ccb0d05b4191b704aafaf5803</md5file>
-<md5file name="salaries.lang">becd3ff12eb9f1b6de5082ea51c5bf9b</md5file>
-<md5file name="trips.lang">ba79a127979def278922a780ad5b1c5b</md5file>
-<md5file name="sendings.lang">322469f3805d514f7b1d9c762d6cd232</md5file>
-<md5file name="accountancy.lang">36627e0497fd8aaf39664403ae6daa96</md5file>
-<md5file name="externalsite.lang">af1f4c3b96562f5bf2f6a74c89f86c30</md5file>
-</dir>
-<dir name="/langs/lt_LT" >
-<md5file name="projects.lang">452a9821ef1ce8558bbd614701dae135</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">6d53c83d0c2f41f894615f0efd6c8cc9</md5file>
-<md5file name="bills.lang">da34918d0b1a456b0f5804c7604bc6bc</md5file>
-<md5file name="orders.lang">7abcf80b038ed1d22f9a8025a6576eb7</md5file>
-<md5file name="admin.lang">d00f7b831a3a4ee6886a57307c445a55</md5file>
-<md5file name="withdrawals.lang">7519e01ebfaf184e31451303d0fc5faa</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">70ba2538054b4121e9e5869a5a611933</md5file>
-<md5file name="boxes.lang">5091bcab97706bf0b5ad791622590c58</md5file>
-<md5file name="members.lang">25ad1618cb45d3588c3e0f8e6944c4da</md5file>
-<md5file name="ecm.lang">5048c5e51454ca4696b60c9602346380</md5file>
-<md5file name="link.lang">c20ab41f5aa4a840ba470dfd3c1721e6</md5file>
-<md5file name="stocks.lang">a87a5823097f9b179e9ca41f4df15ff5</md5file>
-<md5file name="products.lang">39bc7a0d47d973990f7cceaf54eebe9a</md5file>
-<md5file name="printing.lang">5220ad42964fc5e17e0737370f1b02cd</md5file>
-<md5file name="banks.lang">bd58aa4fd49df12490b2939804dc014d</md5file>
-<md5file name="agenda.lang">be9aaca861b2c4ec30707d2afc503f25</md5file>
-<md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">57a194e6fe07e08d93593ad2afd6222a</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">74acfae0cf773d1140832af7e5667186</md5file>
-<md5file name="categories.lang">b8d00cecdd692f0b6cdbe4957f4ffcf3</md5file>
-<md5file name="paybox.lang">95edb6168835f5a622cd7fb18fa665d3</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">2e649b660a18eb203a07078ca6f0ddb0</md5file>
-<md5file name="companies.lang">f7a45f1637139cc5d99a4ae6e7d505e8</md5file>
-<md5file name="margins.lang">c590c3f7bd0bc1c8991c0b7f173d46cd</md5file>
-<md5file name="ftp.lang">bc42bdb14826011d606a142a4e116bc3</md5file>
-<md5file name="exports.lang">fa802c1dfdd44a7ecb89c77d60838a9a</md5file>
-<md5file name="paypal.lang">5b4959ed0c32ed6a409144c78c8b9fb4</md5file>
-<md5file name="cron.lang">54ce90907c5b76dfccd2b3ce0eb7bcbc</md5file>
-<md5file name="interventions.lang">8560f8e577caef690e5546fec123b76c</md5file>
-<md5file name="errors.lang">bf1988713292dc8e6133795d8fde1b0f</md5file>
-<md5file name="compta.lang">0c909a51481d661330ed83a8f0d6a5fa</md5file>
-<md5file name="suppliers.lang">be52ecc505ea2cd13064e83f28eead68</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">a114ac6eecd4701929fe3fd8f172dee5</md5file>
-<md5file name="contracts.lang">e17132c2639ccf18dab581736d16ab19</md5file>
-<md5file name="deliveries.lang">a7af99484311ff510f4378fe059ed4b5</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">55feaae249a847ccaa0432b7c84bb41b</md5file>
-<md5file name="propal.lang">45045a9eec7c672c032ec3f2697cf63c</md5file>
-<md5file name="main.lang">10c76b7bdf44361e8c5a37855d450a9c</md5file>
-<md5file name="languages.lang">387ae164057bda4a65b16b3d4da03026</md5file>
-<md5file name="bookmarks.lang">0ad67108567f99662f7dabc9585331da</md5file>
-<md5file name="sms.lang">9e73e48da807bd19ea533c4e65a2e6c7</md5file>
-<md5file name="dict.lang">31b983b50ce8d8e45c4d311797756dce</md5file>
-<md5file name="mails.lang">bd993bfecb71e53562fe2f11ff3ec37c</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">f663087045123171ae4ef4a5b282c7b9</md5file>
-<md5file name="commercial.lang">51ffcf7fea03b77d0078ac35e99944a9</md5file>
-<md5file name="salaries.lang">1c69f14e9f4dfa446476883fe9faf925</md5file>
-<md5file name="trips.lang">369ab954165562248ee42ab33e6b12a0</md5file>
-<md5file name="sendings.lang">2772e4b190f0ac3a3de994f9edf10074</md5file>
-<md5file name="accountancy.lang">7538088f7af45b9a359a090b9bd18121</md5file>
-<md5file name="externalsite.lang">56d8a0b2df579f5cead684b83fdef191</md5file>
-</dir>
-<dir name="/langs/fr_CH" >
-<md5file name="bills.lang">503179eef2a75e444e6ed540ab5816af</md5file>
-<md5file name="admin.lang">875e0a4fbf2f9e739dd18dd9787966a9</md5file>
-<md5file name="exports.lang">28f44c26afebd0f551578f04045c6496</md5file>
-<md5file name="errors.lang">6230437ad4adfb173f89c5c9b1cd3301</md5file>
-<md5file name="main.lang">b2ee3e61485fdeb685fc7f73bf802b23</md5file>
-<md5file name="languages.lang">7d6b8f45303f24ad769fb402b9416bb5</md5file>
-<md5file name="accountancy.lang">9ed2bf9282af9c376568885348569e87</md5file>
-</dir>
-<dir name="/langs/es_HN" >
-<md5file name="bills.lang">eb0d31b8fe30bfb4b4a2cac24e104c61</md5file>
-<md5file name="admin.lang">9fd4d804edecddba37f21602c6cf2728</md5file>
-<md5file name="companies.lang">954e3a894921531b3a0501372855a38f</md5file>
-<md5file name="compta.lang">9c12fd584bce3751c45e6ceaf38f94ed</md5file>
-<md5file name="propal.lang">28dad238042abf98d2a4b40648effc46</md5file>
-<md5file name="main.lang">e70e0c0be5993759f867484624b7270f</md5file>
-</dir>
-<dir name="/langs/nl_BE" >
-<md5file name="install.lang">9f8505322412399b5acbf5ee73337eab</md5file>
-<md5file name="main.lang">3fd084ee76aa52b4e20b601babbb11cb</md5file>
-</dir>
-<dir name="/langs/uk_UA" >
-<md5file name="projects.lang">4e9739c5d4dd7d7150093400f77e392e</md5file>
-<md5file name="cashdesk.lang">c3e50ad0d4c93692a2810e136ada70d7</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">d2920c2ffdac4cb2905142099ba74fe8</md5file>
-<md5file name="orders.lang">5d9b7ccd6766e9e943b206c4e288cea8</md5file>
-<md5file name="admin.lang">1f17d66cf1563e4c46196516bcc73b42</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">55b226d18eb7824edad5050c3090b348</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">249a59e20ad0f29165045c375cf123ca</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">0a95085c8a3f3efcd5a63702b1bf537b</md5file>
-<md5file name="agenda.lang">89d74d9cd7885c8ceaba6f9a15ec3589</md5file>
-<md5file name="help.lang">d976f528676688719bb4ed9da722c798</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">681bb6760c742ae699ed900dca34241d</md5file>
-<md5file name="users.lang">d91a412e4582686aee55e22120f10420</md5file>
-<md5file name="companies.lang">7b331d712e358d5793e19167ab42d4b9</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">92ac14a3dd5307e6bc4429f625ac3f5b</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">f5c74ffcbb82b66d295e84cb0c11b477</md5file>
-<md5file name="deliveries.lang">4e186ea8084c33de3fec3182f57150ec</md5file>
-<md5file name="mailmanspip.lang">fb5913e34a812d5fdf9e25b8ca8c9fb2</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">c57c2471c7a6eddd29d27909cc422e41</md5file>
-<md5file name="main.lang">33ac9fc2bc7ea230d394ac0b811677c7</md5file>
-<md5file name="languages.lang">19e964a00e47d79e98eac8e4e3cfe3dd</md5file>
-<md5file name="bookmarks.lang">8cc192424d2a8a3a8439cf6c9e9c866d</md5file>
-<md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
-<md5file name="dict.lang">c95d9dd5cdb6d9a6824a6bdbefb48531</md5file>
-<md5file name="mails.lang">fe15c711278cda92b6fe60ad0bd4a4a1</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">b59c994938b335efe318af6e6cd7d977</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">d7385726059a0035f5c91a2c1602f235</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">f1f34d8c0f864daa5e8ab56801027430</md5file>
-</dir>
-<dir name="/langs/hr_HR" >
-<md5file name="projects.lang">df295d90be1a982bfcf7cf01c641aa75</md5file>
-<md5file name="cashdesk.lang">9e04b2cd1b93f421705034d5206749d8</md5file>
-<md5file name="workflow.lang">2cc2731ed536bf38737bfc2897163b4f</md5file>
-<md5file name="bills.lang">4b408813ba07c4aaf7494a0dce45db2b</md5file>
-<md5file name="orders.lang">58d8a88c479e8ef6bfe376130f2d7fd7</md5file>
-<md5file name="admin.lang">bf0bfe2c95f6532f0440971af8572697</md5file>
-<md5file name="withdrawals.lang">545b1414d82cdd476e8d6676161e3103</md5file>
-<md5file name="incoterm.lang">83d51da6ce128a36cd2e5d2dbab76ce0</md5file>
-<md5file name="loan.lang">f2a97948d26385dbf048ef0cf2c525d7</md5file>
-<md5file name="boxes.lang">d1a443d8f9c8f096368d1d3871ad69e2</md5file>
-<md5file name="members.lang">044e22c98deb3d6da5898931cee7224c</md5file>
-<md5file name="ecm.lang">599619a98b0411989a763faf1c6ede75</md5file>
-<md5file name="link.lang">9074eff322d7513a6589a181dfc089ec</md5file>
-<md5file name="stocks.lang">d255ea5b9df613deb7f8f85bc5c93241</md5file>
-<md5file name="products.lang">8b4845bccbb06c9c8d6870a50486ac45</md5file>
-<md5file name="printing.lang">fb330418c81c08843a8ecc7b41911c3e</md5file>
-<md5file name="banks.lang">8f385289997f3f192b47d00582f52c24</md5file>
-<md5file name="agenda.lang">06b696eb0e3787682befe68fb70ea395</md5file>
-<md5file name="help.lang">87204bb4bc4b2de9530578fce343498a</md5file>
-<md5file name="holiday.lang">f28c1d91837eecde379d863333ad3da7</md5file>
-<md5file name="productbatch.lang">1898ba53941f49ece5a58b90fdac3ebd</md5file>
-<md5file name="resource.lang">7353c73dcba6a3beb03620ccb68802b3</md5file>
-<md5file name="categories.lang">5568084ceebffcae386fc1ec48e7ffa8</md5file>
-<md5file name="paybox.lang">17da2830504929531702d918d538bece</md5file>
-<md5file name="ldap.lang">a42be7db361dd5993f28868e4a3f358f</md5file>
-<md5file name="users.lang">6debf0d0e4964cc8c9e574386a87e036</md5file>
-<md5file name="companies.lang">3ccfaadb5ee1a1c4fe90a33682336ba6</md5file>
-<md5file name="margins.lang">05a11b19b5162789760c9838a936df75</md5file>
-<md5file name="ftp.lang">74e5138e0485400d0958b5c137a8634e</md5file>
-<md5file name="exports.lang">ab80eb398c1cfa95b56a5b1dc2b7ce7d</md5file>
-<md5file name="paypal.lang">5f93e31d32cd99d38e3d59c80b4137ff</md5file>
-<md5file name="cron.lang">df979559da6c099664af3c61b83b9e14</md5file>
-<md5file name="interventions.lang">3b9488c55a6633217590c01acb9c0d8e</md5file>
-<md5file name="errors.lang">58ce4b88e87e271384435fc25c0f8144</md5file>
-<md5file name="compta.lang">bb6a51f4eb6b3c8f00bfe1cdb89cd76a</md5file>
-<md5file name="suppliers.lang">5b4aa669a151dc30f4dba6f345177d91</md5file>
-<md5file name="opensurvey.lang">1ca4e724a542dd90368a4612a878aa7a</md5file>
-<md5file name="donations.lang">07692372f9f22331da5ca1cc604206c4</md5file>
-<md5file name="contracts.lang">589333633b6d1adbabfd86f078697ed1</md5file>
-<md5file name="deliveries.lang">309215b54637ec841c73ad9cb60c92c2</md5file>
-<md5file name="mailmanspip.lang">f326d01ea1f9cb89d96aafdbf65dfcf7</md5file>
-<md5file name="install.lang">5c421382d1ed9e5e1f86f3bea1f29cc9</md5file>
-<md5file name="propal.lang">e0ba51b98a7560425f1296e931803c92</md5file>
-<md5file name="main.lang">8f91213f34f0244a5160d7e826d145c2</md5file>
-<md5file name="languages.lang">c88e3c2e66b2d80b141a1e0bbc1e002b</md5file>
-<md5file name="bookmarks.lang">3c262e53abae368513df941815512cac</md5file>
-<md5file name="sms.lang">3122c8015a2583d254fbdead8e4fde52</md5file>
-<md5file name="dict.lang">5b30fbe3329f2544372a731e50272392</md5file>
-<md5file name="mails.lang">f6118b412225605b9bfe2d33480f8f4b</md5file>
-<md5file name="printipp.lang">37c8cf292316d659b712e3e792776e3f</md5file>
-<md5file name="other.lang">bdb2338095a4ea340c6d023c861169c6</md5file>
-<md5file name="commercial.lang">61d90889b920b416295702168623f0fc</md5file>
-<md5file name="salaries.lang">449de434949a3e2b8780a87e7b179d3c</md5file>
-<md5file name="trips.lang">3ecfa35141eae057f996daee3608c0c8</md5file>
-<md5file name="sendings.lang">392d29d07b9eecdc15f88bbade3f4553</md5file>
-<md5file name="accountancy.lang">c04c20e9e0d8940e6a34a3de26975bfc</md5file>
-<md5file name="externalsite.lang">5e857db1c2b2f3c5b49fd68ef1fbad23</md5file>
-</dir>
-<dir name="/api/admin" >
-<md5file name="api.php">1cb778e0cac8df86be98cafa49b96ea0</md5file>
-</dir>
-<dir name="/api/class" >
-<md5file name="api_access.class.php">ad89dc6f40337aa8a8d33fd58a43c541</md5file>
-<md5file name="api.class.php">531b1097bf8f14f6d2be30c1cb04e9ab</md5file>
-</dir>
-<dir name="/api" >
-<md5file name="index.php">414ab6b84388449e8d1c62fd98bca2a4</md5file>
-</dir>
-<dir name="/asterisk" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="wrapper.php">815cc5332012f7bddded6e6b2dbebdd9</md5file>
-<md5file name="cidlookup.php">adf4d0f538de7decd6b3e4c5140c159a</md5file>
-</dir>
-<dir name="" >
-<md5file name="filefunc.inc.php">c8c27baf9e354f8b070f18500c4b9896</md5file>
-</dir>
-<dir name="/fichinter" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/fichinter/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">b958eee892cb176125ee7d1da87e84ee</md5file>
-</dir>
-<dir name="/fichinter/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fichinter_extrafields.php">efa6821ec03c7730fc13303646bd264a</md5file>
-<md5file name="fichinterdet_extrafields.php">fc61a3df1cb5d3d591c9bca0616b1e4d</md5file>
-</dir>
-<dir name="/fichinter" >
-<md5file name="document.php">32625500a075f907767f520e24cbb23b</md5file>
-<md5file name="card.php">91cea0a4ba9fce3afc289d5690fca4dd</md5file>
-<md5file name="note.php">8326aa93734dd8035a04c12062e68ce4</md5file>
-</dir>
-<dir name="/fichinter/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="fichinter.class.php">6a9c570caec888fedf9faa0032a902a8</md5file>
-</dir>
-<dir name="/fichinter" >
-<md5file name="contact.php">f30fdf4ab338c390c86e1617a5426e0f</md5file>
-<md5file name="info.php">123d27cef1a58bd71d0be5d43709c150</md5file>
-<md5file name="list.php">cb9c4c953a1350de8d779500f2d4f30c</md5file>
-<md5file name="apercu.php">7c588d92e0178284a33300bcd72fc3c5</md5file>
-</dir>
-<dir name="/theme/amarok" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">aef2c07fde9b49868ac5cfeb890e3c3d</md5file>
-</dir>
-<dir name="/theme/amarok/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/amarok/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">a6a0362ae831362830d6e63f1d411527</md5file>
-</dir>
-<dir name="/theme/amarok" >
-<md5file name="graph-color.php">e7bf791432a8d6cd23307b92a1c8bb2e</md5file>
-<md5file name="thumb.png">afc1b063010bbdfd5bbb77f32b9bab8d</md5file>
-</dir>
-<dir name="/theme/amarok/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="object_bookmark.png">1434a3f561a240f1f6e4d9da60b175f4</md5file>
-<md5file name="tick.png">d9698294981e058cce77824d8566be23</md5file>
-<md5file name="view.png">46c16b40aa8611932a4cf9d2a5cdecf2</md5file>
-<md5file name="warning.png">f1d99169e9f6f6e4880a4f2859b53858</md5file>
-<md5file name="calc.png">209c606e619e5d9bfde03b7964b2e58c</md5file>
-<md5file name="puce.png">b4fdc3bfa6f873107eb0cc5123dcc103</md5file>
-<md5file name="filenew.png">3e15daa8fbf0d26ea41f0f77a8210d04</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">b0ef50657bdf39b274b8001cf04f56d3</md5file>
-<md5file name="1leftarrow.png">be1afaebdbd273f8e7b3513e55062d3f</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">f4f33b11ea2cb226c62e1bef772cb8b8</md5file>
-<md5file name="stcomm3.png">8e9817e29da34d82aa0ed0a22bf25c20</md5file>
-<md5file name="object_book.png">70b64d3e4c4df1c3fc3ce1ccdec84c8b</md5file>
-<md5file name="object_stock.png">f5afc9b3751ba3156414a2e246de4d1a</md5file>
-<md5file name="object_task.png">7801b4dc9a77a0f381b38e75ebb17555</md5file>
-<md5file name="history.png">dc4a551bab5b102e1ae5dae1765e5ebd</md5file>
-<md5file name="object_energie.png">a7b15b8c036eac534611baa3c3812fc8</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">656d0d3d0affb188761b87b55c1d4d4f</md5file>
-<md5file name="folder.png">184892aa2d028c58087c6b1a3dfb4176</md5file>
-<md5file name="file.png">46c16b40aa8611932a4cf9d2a5cdecf2</md5file>
-<md5file name="1uparrow_selected.png">ebedcfd1affa6c99dc1ee3056da59481</md5file>
-<md5file name="1rightarrow.png">700b5e229fc3df9a79ac5e32184ae560</md5file>
-<md5file name="object_invoice.png">24b6cf2901fc39dbb560d3a7285df809</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">fbbdeff35bd42e8a5451af28bdfb7f85</md5file>
-<md5file name="close_title.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="detail.png">18e86d815977d05210bde25bdbe95f99</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">b826e95415e3bab01b7842bc774e04cd</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">bbc9e0eea1564653fd34112a84a9d11d</md5file>
-<md5file name="object_calendarweek.png">211ae17d31849410f76fbb9a61958272</md5file>
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="rightarrow.png">c71eb22739f1c20f5e01d9e6b8a19125</md5file>
-<md5file name="statut2.png">0ccb504a5d257aa989789f6df3c51fed</md5file>
-<md5file name="unlock.png">c2f816d0775e41583bab8dd232c4543e</md5file>
-<md5file name="object_email.png">63e15270fc3b12cdcdfdb21e5bf3c1d8</md5file>
-<md5file name="edit.png">1da8850516d4dc2b70f12a878d6fd4d6</md5file>
-<md5file name="object_group.png">5c23baf9f9eaa8a5220d5e44e68a9e79</md5file>
-<md5file name="split.png">79fd6aac5f40e3655d449e602def2745</md5file>
-<md5file name="statut0.png">045a50f182b7174af42c3d67492abb35</md5file>
-<md5file name="object_technic.png">9f4702649068d30fc9ebf5d93d915b25</md5file>
-<md5file name="statut3.png">96e5cc8034742e399eaf6d29a5bbff44</md5file>
-<md5file name="object_bill.png">24b6cf2901fc39dbb560d3a7285df809</md5file>
-<md5file name="on.png">9f88899802a65e6b0eedc1e73fe4c9af</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="object_contact_all.png">5c23baf9f9eaa8a5220d5e44e68a9e79</md5file>
-<md5file name="help.png">3539d020cf07e76dbb34c2b2f806a318</md5file>
-<md5file name="object_phoning.png">68fc31e3d3c0cb616be0cbe585a4fc95</md5file>
-<md5file name="object_dir.png">1f01f59979764124448840d8e3664e99</md5file>
-<md5file name="object_generic.png">1477f60fa99995d7c42c47777c01cec0</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">6f92cd4deb7f23310cf1937b8a707c88</md5file>
-<md5file name="helpdoc.png">5632b97f8db47b036a61cfc515dd685a</md5file>
-<md5file name="object_list.png">f87050f67c6a99dbde1f724a756ee533</md5file>
-<md5file name="object_service.png">5bdaea0c03a407c6cd9f0976674451c8</md5file>
-<md5file name="object_contract.png">bddf314e6c49d62975e7ce1a98016f27</md5file>
-<md5file name="stcomm-1.png">b5d06e9bd03f50a951e4c5ed8d67a9b0</md5file>
-<md5file name="object_user.png">e708e33599499c67f77dae22e8059291</md5file>
-<md5file name="object_billr.png">7ead8fd89e3d36df39f57e85d8608aa9</md5file>
-<md5file name="mainlevel.gif">cb4bb3bec53b441960a91ffcae8cfc94</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">7178d620bb970d5b1c9b337ec3fd4ee7</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">a25cf5c9d33530d9f64a87fd6158f808</md5file>
-<md5file name="sort_asc_disabled.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="button_edit.png">bfcf1bc67c5a000230501dec6f83bf1a</md5file>
-<md5file name="star.png">bbaaaad3a969fdf2ff5a3c9c56bc7a97</md5file>
-<md5file name="background_login.png">817f1c669dc80ec3b88418d9a1de1faa</md5file>
-<md5file name="vcard.png">e4801ed3c2784c90b72daf7ac3f7c199</md5file>
-<md5file name="1leftarrow_selected.png">88028c932d3ec0eedf2bbf060859b832</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="object_address.png">74801fd5fd2292223cfb6fe7a2cbe33c</md5file>
-<md5file name="high.png">eb13cd08105de7c114006ebdfee345cf</md5file>
-<md5file name="object_category.png">184892aa2d028c58087c6b1a3dfb4176</md5file>
-<md5file name="1downarrow.png">39316cba629dcc3ab2c1358f99bdc441</md5file>
-<md5file name="uparrow.png">cf14e73ccf77ab5a87729348fe5f0817</md5file>
-<md5file name="previous.png">a67ffa2ce31670c0084995a33ffe69ea</md5file>
-<md5file name="edit_add.png">26ce8e4aa288aa38bb10865675d08cd3</md5file>
-<md5file name="statut1.png">323e98d0535d615c49de20b9e4f5b0ce</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">f6230a6dad952d01c3ff0dde61abd51c</md5file>
-<md5file name="object_category-expanded.png">b3a249e8c5ca01d1fa6abf52799734fd</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">5cbf1c11abbc61f829480909d7ca3304</md5file>
-<md5file name="object_trip.png">6e92e55632a8e9fbc63934919120ee79</md5file>
-<md5file name="1downarrow_selected.png">80fac46f6e4995ccc5d57172d19da940</md5file>
-<md5file name="pdf3.png">069211010dbdf6973a5a635636c77e04</md5file>
-<md5file name="filter.png">e046eef32f98374dabcc7bcf93e1c458</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">af408a99d18343fe39335a64aebaa721</md5file>
-<md5file name="reload.png">21b6ec907d91d1b24f05fc12e4ba544a</md5file>
-<md5file name="folder-open.png">b3a249e8c5ca01d1fa6abf52799734fd</md5file>
-<md5file name="ok.png">dc30723e9a013e4fd691ff5e3455526e</md5file>
-<md5file name="addfile.png">74aa63906a70c296b099a83a54d050aa</md5file>
-<md5file name="grip_title.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="searchclear.png">64d94d9b591ba74fe34acdc43f4f0cd8</md5file>
-<md5file name="error.png">eb13cd08105de7c114006ebdfee345cf</md5file>
-<md5file name="cron.png">33c4116fccc3ff06e1c82060d90c1aac</md5file>
-<md5file name="object_sending.png">dd5dba0413ea60a3ed433fcfde0e067f</md5file>
-<md5file name="object_company.png">31264269b629589160d5c159e9301c6f</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="statut7.png">44bc863e69f5199f55a3d5b8ab76d1b8</md5file>
-<md5file name="object_calendarday.png">3c87509df71fb8c41cf31fce258bdf11</md5file>
-<md5file name="title.png">9728bf99f96b44c2f09c2e03a8169033</md5file>
-<md5file name="call_out.png">d7fdd00204235a28376c74e5c147c416</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">5646544e739cf70d2a716b8eaaac088a</md5file>
-<md5file name="stcomm1.png">ec187dda16f6e893dba5752cb5859dc4</md5file>
-<md5file name="1updownarrow.png">80ea34522ffdde39df621f74f8536706</md5file>
-<md5file name="calendar.png">656d0d3d0affb188761b87b55c1d4d4f</md5file>
-<md5file name="object_contact.png">77199a3c1980e839a1e6fb305c691f67</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="printer.png">231c3e883b6a69af4bacecfbed2880b8</md5file>
-<md5file name="disable.png">2fc34147737d9a0216f49ea04c64d883</md5file>
-<md5file name="editdelete.png">2fc34147737d9a0216f49ea04c64d883</md5file>
-<md5file name="object_intervention.png">b5bb7147b7b10e98381c5d852fc9bc09</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="money.png">6f140c1e8e4f1da9fc3dac7cc60d6d0e</md5file>
-<md5file name="object_payment.png">0138cd67a5d8f6c45c91a89965af4517</md5file>
-<md5file name="stats.png">c15c695089d04360c277f3388c347964</md5file>
-<md5file name="lock.png">402676b50ec901254f7c559fa14952a6</md5file>
-<md5file name="redstar.png">38e31a8fe2f855915ddf43831fd69956</md5file>
-<md5file name="object_billd.png">dfd7216140b53214e05b7afbcea2019e</md5file>
-<md5file name="object_product.png">249cca2afef9ab5b10500d3f183acddc</md5file>
-<md5file name="statut9.png">61c9cc60ef9341b6d9b7df4396cc3e87</md5file>
-<md5file name="search.png">5089f53c8644f49a4aaacca03657aede</md5file>
-<md5file name="statut5.png">58f730f9515282ae9c2f193720b06c1a</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">7714b390ff497c388fbdcfe8c0563790</md5file>
-<md5file name="object_billa.png">f7a3152e8f470a2c450b0f90d02c2d52</md5file>
-<md5file name="object_calendar.png">cb1832b4f5fad4d0d1b7d4a8f002b489</md5file>
-<md5file name="object_project.png">8596a359d59ce8d05e9e1ff6cb9bf766</md5file>
-<md5file name="vmenu.png">f72b01ec596197be77bad01ac6af6a2d</md5file>
-<md5file name="object_phoning_fax.png">68fc31e3d3c0cb616be0cbe585a4fc95</md5file>
-<md5file name="sort_asc.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="object_order.png">adcea0d1b3addc074d69f56f89874220</md5file>
-<md5file name="close.png">06ad1905f6c0eb21fc7e5d9f2ea85897</md5file>
-<md5file name="edit_remove.png">eee919753151d6e7bc3e602f1b33caab</md5file>
-<md5file name="indent1.png">a7321a0a32895a3b6a04b458da311c83</md5file>
-<md5file name="object_globe.png">e9a5a0da7f023261dac8a651c3180d27</md5file>
-<md5file name="statut6.png">0ccb504a5d257aa989789f6df3c51fed</md5file>
-<md5file name="object_propal.png">aefe79f17f49fc74ddc7af2f78c2eed6</md5file>
-<md5file name="info.png">04720837e9a79ca6ca6af767d954231b</md5file>
-<md5file name="recent.png">b54bca6771c1ca6677e21ac8f439c3e2</md5file>
-<md5file name="stcomm4.png">eaf4e2f7a47bc0667929e7d0f1a3abdf</md5file>
-<md5file name="object_reduc.png">46c16b40aa8611932a4cf9d2a5cdecf2</md5file>
-<md5file name="object_account.png">fdbd41ee38f65a067194317042dc60d6</md5file>
-<md5file name="object_margin.png">270459e5379969c8d30e6f3bd9c99ce8</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">402676b50ec901254f7c559fa14952a6</md5file>
-<md5file name="stcomm2.png">b52f00b91b90fbb38d6fadda3aa156fa</md5file>
-<md5file name="off.png">395243ebd988a0f3c8397d4263322197</md5file>
-<md5file name="object_projecttask.png">7801b4dc9a77a0f381b38e75ebb17555</md5file>
-<md5file name="statut8.png">5f45af7387a1f950e81bec69ccc6b122</md5file>
-<md5file name="delete.png">fa603d107cf8753b24f4d14c0f87fa26</md5file>
-<md5file name="statut4.png">8343464f7cebeb9f11dc710e123929eb</md5file>
-</dir>
-<dir name="/theme" >
-<md5file name="login_logo.png">09ce82fd4e818461e7f6b47501ef80ca</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doliforge_logo.png">3ff399136d04561cc27c3d9b839a9099</md5file>
-<md5file name="dolibarr_logo.png">8b066f77cd96776d1046ebaec421c36c</md5file>
-</dir>
-<dir name="/theme/common" >
-<md5file name="transform-crop-and-resize.png">eea3e104501f53967997a20a03fc42dd</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="logo_cerfa.png">bc25658adebf7ce5332497399121dfe0</md5file>
-</dir>
-<dir name="/theme/common/weather" >
-<md5file name="weather-showers-scattered-day.png">9810b1cef4c1821ed9909a6313cf1fd1</md5file>
-<md5file name="weather-clear.png">35ada07724a911510aa0cb2f20b9678d</md5file>
-<md5file name="weather-storm.png">b88c100ff05cfa1af092543bf1f61bb8</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="weather-snow-scattered-day.png">0e8f5f08ceb1d48ce3372f323e2356be</md5file>
-<md5file name="weather-few-clouds-night.png">56ca1be6d8e073679cc5c98b1330443a</md5file>
-<md5file name="weather-showers-day.png">4f0d3ae4d3590264504070de22cef435</md5file>
-<md5file name="weather-few-clouds.png">f2504ee0583ce12c58aaff9c569217a7</md5file>
-<md5file name="weather-hail.png">17b566296feac4f9e98afe91a74e34a5</md5file>
-<md5file name="weather-snow-scattered.png">0e9cfb992296aee33204d1d3e9916321</md5file>
-<md5file name="weather-showers.png">21c8119beb6f441ae3cee8ba5f56cb88</md5file>
-<md5file name="weather-snow-scattered-night.png">f3d23379be8d4c8b6b802f705b8b5389</md5file>
-<md5file name="weather-storm-night.png">f37f6c723a49a7d2e75e4684d79c242d</md5file>
-<md5file name="weather-snow.png">089f6d1e79197140a55a05a958142387</md5file>
-<md5file name="weather-snow-rain.png">96a88cc2799db0e2ec37d318b12d4bf9</md5file>
-<md5file name="weather-showers-scattered.png">51f7b61c9921fc7e5aa3400ad960d53d</md5file>
-<md5file name="weather-storm-day.png">77abdfb77700f022c7ab0d27537e5a1d</md5file>
-<md5file name="weather-clear-night.png">5fa9a7c0e8eb9f88642e19b7361071e2</md5file>
-<md5file name="weather-freezing-rain.png">f4483404356faa91731805a543968f49</md5file>
-<md5file name="weather-showers-scattered-night.png">53de27921ab92e2392b47c4b62f2608e</md5file>
-<md5file name="weather-mist.png">d3c3bf844a6b83632433bc164580854f</md5file>
-<md5file name="weather-showers-night.png">2ff7a61d2bbd8a04df03c8e5a694cf15</md5file>
-<md5file name="weather-clouds.png">77cb3ae7fad9e2ee7cfc00f8cbc7a91f</md5file>
-<md5file name="weather-clouds-night.png">a0818d60c6be30ba4b2674df5fea75ad</md5file>
-<md5file name="weather-many-clouds.png">0c70931cbccf0d0f5711e9f5a235ba9b</md5file>
-</dir>
-<dir name="/theme/common/flags" >
-<md5file name="it.png">774aa5e83df34cc3f91576854f011220</md5file>
-<md5file name="ph.png">af054e807cb59c2a8862618cf8e7a120</md5file>
-<md5file name="gg.png">b6167341a2c1b0ce52edcd03353dd464</md5file>
-<md5file name="int.png">f90a482881b094f398cfea3473bcdcb0</md5file>
-<md5file name="ca.png">c49bf80333dbffd2ef9aeeb9ccfa700a</md5file>
-<md5file name="scotland.png">15e3b3359f5d0e64efc557727a57bdc2</md5file>
-<md5file name="cs.png">fe1a4f8260d6f21ea9f9d26ec154df59</md5file>
-<md5file name="km.png">231be9007edc9432630b44369f2d819d</md5file>
-<md5file name="fk.png">70780d43b2301396dcdc3ba883615534</md5file>
-<md5file name="vc.png">11e6ed8c7c12811fade97c7fc50d23ef</md5file>
-<md5file name="ua.png">a10710d2b0e460db41c63198261133d9</md5file>
-<md5file name="gu.png">940ad1b3ad78d603c00c6fe0fd29158f</md5file>
-<md5file name="na.png">04fc9d2d2d778a1c51f7602b043968b0</md5file>
-<md5file name="kn.png">43da1a13de6b74b229e87f2254901eb8</md5file>
-<md5file name="mo.png">9cf91bb999511aca9c64f1960b7e5347</md5file>
-<md5file name="et.png">a84b4ac562f48fa0db41bb9482328faa</md5file>
-<md5file name="ar.png">f5c80364beda6369b49e6af373c21588</md5file>
-<md5file name="mm.png">d4dd559531b0440a1ea9244340e3def0</md5file>
-<md5file name="gn.png">e7d7ba0591d03fb54886081dba55842d</md5file>
-<md5file name="ad.png">18ad47ae4370502b626a9c97da302c98</md5file>
-<md5file name="bv.png">a1fd4462ddf33d9959511b042bc85d0f</md5file>
-<md5file name="tj.png">4794032e0a29bc4b968ea9cb25dead45</md5file>
-<md5file name="ne.png">31ea4b1b268235ac09b462eb15c1178b</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="gd.png">19bc9d6e776897451da4a42998962117</md5file>
-<md5file name="de.png">b65d09069ec446c0014036cb3fdc748e</md5file>
-<md5file name="br.png">4fdaafdcf368b7a90527e8e8c5dcf541</md5file>
-<md5file name="sl.png">ff9be4f9f663192885df9ecbeff2d3f6</md5file>
-<md5file name="tf.png">44f6219f5d9c34527a71c0cccb2306ce</md5file>
-<md5file name="vu.png">0fbcd2cf77d097cd0767ddf31d97a062</md5file>
-<md5file name="ec.png">956a9467791544af1691056173191f19</md5file>
-<md5file name="ve.png">c8d0c70a5fecee469664a73b21baad7c</md5file>
-<md5file name="nc.png">712730dc8eacbcdde49e3058e87f9453</md5file>
-<md5file name="pm.png">4a89044f17e6da2ebaa0b323cb3eb547</md5file>
-<md5file name="sm.png">fa36f20b7c0d398fc4385c6cbe00c20d</md5file>
-<md5file name="sh.png">c3dde7f9f3d18dee3ffb87074c27cbde</md5file>
-<md5file name="pt.png">792f95535c7f2d242110aa879717cf2d</md5file>
-<md5file name="in.png">4ea257c73e8f5c6c12fd12d154e5d482</md5file>
-<md5file name="se.png">d3c4da9f47d4872f8c5c3743ab162314</md5file>
-<md5file name="fi.png">4eb34d5348d9f867cfade02a16029422</md5file>
-<md5file name="ws.png">efcfaeae59e264f27c0a046f83bbea3d</md5file>
-<md5file name="gl.png">d296cd3a0c82798fa66d4442b0514c65</md5file>
-<md5file name="so.png">e7d410ae84757632ff7fd39171bdb36d</md5file>
-<md5file name="cu.png">3e287254af9d483cc20dee24c615e38b</md5file>
-<md5file name="lk.png">73afde9ef9cae4a2c17bee5094028180</md5file>
-<md5file name="rs.png">65f1c8f81f6ea903dc7f721720d18f8b</md5file>
-<md5file name="io.png">289e3a21483c34cb3c7163a0b0339048</md5file>
-<md5file name="sn.png">9bbc219ad2d289762be4a42cd4156e5e</md5file>
-<md5file name="fj.png">f9de0a1fcb3c19c973e382e65fc31c4c</md5file>
-<md5file name="bh.png">05d984d940df2e0c8e95726d1adb0138</md5file>
-<md5file name="nf.png">1b21bcf3a31e16eb01575d546a8ddc73</md5file>
-<md5file name="um.png">d48919324ecd66c95b4439d87903254d</md5file>
-<md5file name="mv.png">7a9b60008090747570d184f6185eacba</md5file>
-<md5file name="mu.png">2ba292598dca941a2acb16588a729569</md5file>
-<md5file name="tm.png">be8e24b74d91c7f072a83125fda2e9b1</md5file>
-<md5file name="bi.png">b5e3cb6ffa54daa488d049b692ace165</md5file>
-<md5file name="vn.png">b8e083dc6318358cff0019d29311814a</md5file>
-<md5file name="to.png">80a5fa615caaf397e32a2ca096814061</md5file>
-<md5file name="sd.png">29da23f210ded21179562ef771e281bf</md5file>
-<md5file name="mn.png">0925474a60a7d087119ae966d5cc926d</md5file>
-<md5file name="tg.png">dc332a44414046c93eefe7a804c155f0</md5file>
-<md5file name="sj.png">a1fd4462ddf33d9959511b042bc85d0f</md5file>
-<md5file name="kg.png">e11278e9bfed8b1cac83f3c09ad6d175</md5file>
-<md5file name="nz.png">000a9812bdcde8014b7b80c58b98452d</md5file>
-<md5file name="cl.png">d274b3bd9ab6cbe0847492e09bc17b26</md5file>
-<md5file name="hn.png">dc4ea9364d8efb3881905f68d1ba016c</md5file>
-<md5file name="nr.png">99aae625b370db00c75bffa40d22515f</md5file>
-<md5file name="cn.png">a8dcc9c1af18986c1de6eef93bd9615e</md5file>
-<md5file name="bw.png">2bb6eb2d060824aae199568f54e00503</md5file>
-<md5file name="gs.png">33acf6ed14eeaa977790e7123fae9d1d</md5file>
-<md5file name="ke.png">2b285856d7f32d4c4c9941135e983ce2</md5file>
-<md5file name="is.png">2d5c1290d23edbcdba1c5425bf16a0de</md5file>
-<md5file name="ml.png">6ce707c982c104bde6300faf6ee61b14</md5file>
-<md5file name="pa.png">9e866e4d54f4d332f44de7f26bee7758</md5file>
-<md5file name="mx.png">ede909c44382b72a00e182411787c9fb</md5file>
-<md5file name="mq.png">f79ff4f531fe57fd76a48b29edd49ff9</md5file>
-<md5file name="ie.png">93add805d11b487204cdcbf396af297c</md5file>
-<md5file name="jp.png">e2c40ec99dea692cc920781b8a25bb9a</md5file>
-<md5file name="tr.png">01e4f38286a1328cb456ad497df0df84</md5file>
-<md5file name="ni.png">66d9642b28c9a9f7ea35df000e6637c4</md5file>
-<md5file name="si.png">c7fd803906579e2870c37f7c6dc1f287</md5file>
-<md5file name="tk.png">fd785e8184d91ce160641378dc942792</md5file>
-<md5file name="sb.png">f91d4ccc0c3346a1d1541271fa945b2f</md5file>
-<md5file name="iq.png">99884a8900f579cd62619119a011311f</md5file>
-<md5file name="jm.png">723903d5fccc803cf724c2bc68eb78f5</md5file>
-<md5file name="tt.png">01882be75b36720c3dd35d483f0da9b7</md5file>
-<md5file name="eh.png">585642a0258d4de2b55bb520bfbb51ec</md5file>
-<md5file name="uy.png">dbb6d599916edfcc0e69df3ccbaf11c4</md5file>
-<md5file name="ro.png">a4747d339b09c350f180530593b4e446</md5file>
-<md5file name="catalonia.png">df30cacec99cd536a46d4d710d4cd0d6</md5file>
-<md5file name="pn.png">40566fb3b79a6a5857623d1828e078aa</md5file>
-<md5file name="sc.png">a6a731b2237aaacd679c87fbc30952ea</md5file>
-<md5file name="sz.png">2123bf0843c54410a6360155c292dd07</md5file>
-<md5file name="va.png">063fded4fc55af7113065bdb6a6d13bc</md5file>
-<md5file name="ck.png">6b88763de381191ebd21b1d8f815eecb</md5file>
-<md5file name="gq.png">5148c1862c4c06f8bcb22146d8ce0bc7</md5file>
-<md5file name="gh.png">5993a2e0b03a08005a23ec0bffec49aa</md5file>
-<md5file name="bd.png">0f8e90793a5d0075ddd55893d5d49067</md5file>
-<md5file name="tn.png">eb1f7b820126acf733ad86f742297ceb</md5file>
-<md5file name="as.png">5b998f19eee37b6e4b48984a2778a6c8</md5file>
-<md5file name="bz.png">90358cba38f3616a16ff65d2ac76f94f</md5file>
-<md5file name="us.png">eef6f3da813d1d13c22e834a01269715</md5file>
-<md5file name="hr.png">6548fec65e29cc9437d7a69750d06a0e</md5file>
-<md5file name="ax.png">4624db3734b1e0d2d2daf2e1a3075de6</md5file>
-<md5file name="eg.png">8c47d4eb5625b0fbba21f7badc7e9694</md5file>
-<md5file name="am.png">dbea0c8432a121b189f443ed553ac590</md5file>
-<md5file name="li.png">5aae4c3d4f831d29c58fdd1ea90b414c</md5file>
-<md5file name="td.png">c8edc74a6de1527d12f1552554b3965d</md5file>
-<md5file name="lu.png">fe4eded2e82a49e7eeec04a57c0eaaca</md5file>
-<md5file name="cy.png">e552713e4d8746959be3840562cedd4f</md5file>
-<md5file name="re.png">7cd3cb27cffdb26ec9bc893879022fa2</md5file>
-<md5file name="ly.png">79bcfa4d08d9b0480e45ce8943500b75</md5file>
-<md5file name="mr.png">00705230d6d3a8a360cf4ccebb6b4808</md5file>
-<md5file name="la.png">3e388f0f6a16e442d7217f7f5ac0ac70</md5file>
-<md5file name="england.png">be2a5064570cce93cb27f66e6c63a450</md5file>
-<md5file name="vg.png">7c966e0ac8b005230d2dc6f9c2bdfb4f</md5file>
-<md5file name="gb.png">89feb1c83c324e468f77f547afd6dcfd</md5file>
-<md5file name="bn.png">8341937457bd3fe384540c016f44ff79</md5file>
-<md5file name="by.png">e97837e90f79a8c3b9be2aefb707c986</md5file>
-<md5file name="mt.png">b04e6c6785146e49bbf046137761016e</md5file>
-<md5file name="th.png">bb3cd2dcbd5d21f1ca284ffa1ad07831</md5file>
-<md5file name="ng.png">f94d172647e3462d128294621a43389b</md5file>
-<md5file name="zw.png">d24f6b1b1a4167bf6d452edf43fc43f9</md5file>
-<md5file name="ai.png">9b8ef286299fa6cc52c9c1117dc116f9</md5file>
-<md5file name="eu.png">f05b20cb0d940946b92d336b3ee16230</md5file>
-<md5file name="nl.png">6f45f24d2c2847d3be377ec767ed6740</md5file>
-<md5file name="pw.png">560540e2be01c0ab7bf34283ad36e8e0</md5file>
-<md5file name="trans.png">e1e9cd63c97e490b1295848e3b6ef08d</md5file>
-<md5file name="sr.png">0bc993144907f56385fe151e664a5940</md5file>
-<md5file name="at.png">1dfb81be162137cee56899d3747d3918</md5file>
-<md5file name="wales.png">3009f0bd6501a7e643490484aeb4fb7a</md5file>
-<md5file name="lb.png">8da0e7aadc18ba23942146b0b2788fe6</md5file>
-<md5file name="ru.png">cc2c1ba385841b4e57e7c3f8d2bcfc52</md5file>
-<md5file name="gt.png">0c3ae02d04c3fc7100c51aac8de78822</md5file>
-<md5file name="om.png">20d08112c34bad25f91560d50ab42afc</md5file>
-<md5file name="gp.png">93e655e7608796ac9d75390f82b58d19</md5file>
-<md5file name="lr.png">73e6adddf2467b4c68caa18c8d6d6c67</md5file>
-<md5file name="np.png">4649a28d1a99856537807f623692f5fe</md5file>
-<md5file name="mp.png">27b26796c01e90c01be2369a04026d60</md5file>
-<md5file name="cz.png">8feb74c99d8748eb7e8154762c615561</md5file>
-<md5file name="gr.png">1247fc5abf94f9875f6a322242024412</md5file>
-<md5file name="pl.png">c31a9db4f598a1edf31700198ec50d26</md5file>
-<md5file name="qa.png">357e70827abcd6e1b13e310b22a72cbe</md5file>
-<md5file name="ye.png">cb4e550f50734e444aef59bf6439c1a8</md5file>
-<md5file name="mz.png">85aea855ac1f3e1011d2362d3cfe59e3</md5file>
-<md5file name="gm.png">0531dafd783b28ec7570e6e1a311acc8</md5file>
-<md5file name="al.png">afe6a0affb85e6afd2cdc8608dfba913</md5file>
-<md5file name="az.png">eda152bd86c12fa304b0d489d61f8f00</md5file>
-<md5file name="sy.png">e7c9ec2d12913127c49c73ee2a643515</md5file>
-<md5file name="gw.png">02ab79dfd7f51b02b60b860b7ce8afad</md5file>
-<md5file name="uz.png">49fe0d286d5b87cf808bf352e5882b01</md5file>
-<md5file name="ky.png">7a5b075120da6d2eed41cb179255794d</md5file>
-<md5file name="id.png">d4b3d1f5fc991b0582f804eb4478881f</md5file>
-<md5file name="nu.png">67f5efd3f354d95140a192b2b512e417</md5file>
-<md5file name="ae.png">8f4b85af8b4e91a099a99ae6add93734</md5file>
-<md5file name="tv.png">c69ae88d065c858479db70c93cbd59f4</md5file>
-<md5file name="ch.png">4b47b691cc2ce2801de96d512583468a</md5file>
-<md5file name="ci.png">aeb2b299359fb35bdea35fa92ea24da6</md5file>
-<md5file name="kz.png">70c946e159dbb8bff23b0074ba847a2c</md5file>
-<md5file name="vi.png">5103ae9bde7811dc675132d8ea32b57e</md5file>
-<md5file name="il.png">dfd395e63be421047109a6d2d50f8cb9</md5file>
-<md5file name="fam.png">a34d4ed87f508bb060c12b369543fecf</md5file>
-<md5file name="za.png">f93e4f18a8515ae7c23e5e6509fe7327</md5file>
-<md5file name="cf.png">2dfb77eddf39f9fc6de5677f5070d308</md5file>
-<md5file name="ms.png">1d88c537abadf776846ee7004edd7528</md5file>
-<md5file name="fm.png">aabdcfe7e06c7512c2b386fbd477b7ad</md5file>
-<md5file name="tl.png">35df884aed8ffc1bd04843f914bdefe2</md5file>
-<md5file name="uk.png">89feb1c83c324e468f77f547afd6dcfd</md5file>
-<md5file name="tw.png">e8066d5925cedcee8e287efda7be0b83</md5file>
-<md5file name="sv.png">6aaa3a31de31e3a5e9e426364a6d750a</md5file>
-<md5file name="ki.png">06bbeb64c794faf5a9506ead75159d9e</md5file>
-<md5file name="ag.png">74f4000b96dd405ec94f8fda2981f7ed</md5file>
-<md5file name="lv.png">130022e7f6155c7feb3a8805eed1fa17</md5file>
-<md5file name="es.png">ddaf35fb0f5f6de35551c674dce5af13</md5file>
-<md5file name="yt.png">ca82a0b827867d8e25b3222842fc9290</md5file>
-<md5file name="wf.png">b26600b0e4fb912d7a7d0409d98faa63</md5file>
-<md5file name="my.png">e34146dc177448781e5f71137230f06f</md5file>
-<md5file name="sg.png">15cff0d1924962e116bd0d6bcaf12bc0</md5file>
-<md5file name="an.png">3a981c259bc9f2329c96ed7419d096c7</md5file>
-<md5file name="kr.png">b332396ea15d7546b048f5ccc42e7104</md5file>
-<md5file name="gf.png">7cd3cb27cffdb26ec9bc893879022fa2</md5file>
-<md5file name="pg.png">9bd382f432b178b65ec6e8f34438806d</md5file>
-<md5file name="cr.png">3fb04ae5a52c47da617faddb535e463d</md5file>
-<md5file name="ug.png">43bc0fcda05ae2bddd4daf5a07395889</md5file>
-<md5file name="ir.png">ac382f23e177acf31f79ce371101769a</md5file>
-<md5file name="kh.png">50c5e7bb6d90547b30c88a38a2d10653</md5file>
-<md5file name="ga.png">29e38139f43d33ba7cc2ee457fe52628</md5file>
-<md5file name="bt.png">5becc14b56e314c5f35e99cc6eac3457</md5file>
-<md5file name="dj.png">cc986d5a5621587f7d86cc3d60338083</md5file>
-<md5file name="py.png">8233503381ddf79b86cb6f312f4aa4c9</md5file>
-<md5file name="mh.png">04b609096db2728072f46ffc835a581c</md5file>
-<md5file name="gi.png">692688f55f454ba43bfb627269347df7</md5file>
-<md5file name="ao.png">4f92ebd3e210ac270c9d4a9e8e8ada1a</md5file>
-<md5file name="do.png">03e1ff43ea8046535b3a1e28d2a3d5b2</md5file>
-<md5file name="gy.png">cc7f036fa37b5f518b78570821a91d1f</md5file>
-<md5file name="ee.png">8413bd4ab3429ac93c55e76ce9ff3ef0</md5file>
-<md5file name="ps.png">72c68a77f9cac4ede5ea93a8ddcad43c</md5file>
-<md5file name="au.png">e7f08d9f0c21f9f57cf6a47333bd221a</md5file>
-<md5file name="tz.png">98297a39a6394970272a8bdf37c2c467</md5file>
-<md5file name="sa.png">05361076eb73c940aee3a92fb488289a</md5file>
-<md5file name="bm.png">cfa4068beb4bb0a04d95faa83d490b1b</md5file>
-<md5file name="no.png">a1fd4462ddf33d9959511b042bc85d0f</md5file>
-<md5file name="aw.png">a65c16f8dbdf88a88822ebdee750ffae</md5file>
-<md5file name="lt.png">a0c460e80ae4880e9c1c32ae397503a5</md5file>
-<md5file name="tc.png">ea9cd085245a4c6048bf654b5833a3e4</md5file>
-<md5file name="ba.png">3fbd3dacb5989dd794dab5ca6ae802ba</md5file>
-<md5file name="af.png">316264e658900c47c263e62642485e1a</md5file>
-<md5file name="md.png">ffdabf9c9d9a11a4e1070c3de6565306</md5file>
-<md5file name="be.png">c25970d4e32e1ed12911ac276dce9f1d</md5file>
-<md5file name="hk.png">64c80bc09a3568badbb471e4d7a8fbe8</md5file>
-<md5file name="mk.png">5f1f96b69c23bc6d72f8d7720c5de271</md5file>
-<md5file name="pk.png">377cb88037021a342c2db782d3718564</md5file>
-<md5file name="bs.png">a1cb56d5ff9ea5a9fcb5f879460f8356</md5file>
-<md5file name="hm.png">e7f08d9f0c21f9f57cf6a47333bd221a</md5file>
-<md5file name="dz.png">448fe3d8d40dd9524e92308363fef9da</md5file>
-<md5file name="st.png">997c11c97bfa8a076bb99c3f0b0ea340</md5file>
-<md5file name="bb.png">aba9db6d3ab58060e1399c434c169ae1</md5file>
-<md5file name="me.png">3cc54618412944027a27f4d573ed0b47</md5file>
-<md5file name="kp.png">c79db6af25efa8e7d808c5c3e824dc87</md5file>
-<md5file name="ls.png">55ecbbd7019bd1c65e0338e30e354c94</md5file>
-<md5file name="ge.png">5a8689e206254ceff9af7228494442f6</md5file>
-<md5file name="jo.png">b3277971df94b3cbd68f45e6d7078b91</md5file>
-<md5file name="kw.png">12ea19cda7f7f76dfb852ac21ee8121d</md5file>
-<md5file name="pe.png">4c811494c0413f7ee4f513c2f6622914</md5file>
-<md5file name="mc.png">c226e7caff0213c3f4a60d70db7ac5ba</md5file>
-<md5file name="rw.png">a44dba6545c02559a2ecb2cd96a46fe1</md5file>
-<md5file name="fo.png">941fdeaadb5826f363cfa6e480b588fc</md5file>
-<md5file name="mg.png">60087a56245dd11337328404dcfd9b68</md5file>
-<md5file name="bf.png">57cdaaa04cf6aa2fe0e9cd2c3b039f99</md5file>
-<md5file name="cx.png">af9aab961fd64d502ef4c6c9037a9e33</md5file>
-<md5file name="ma.png">4e2233388b4cf5719ece9d5e4d8ee8d4</md5file>
-<md5file name="hu.png">30937ce4f4feb25d781acf8f0d952308</md5file>
-<md5file name="cd.png">1ac6898f550c88000b9ef9141500ab87</md5file>
-<md5file name="cv.png">e9769936000050d61aecb36ba7a1ffcb</md5file>
-<md5file name="ht.png">331b9a1b7b9101c7be2f660910e6e001</md5file>
-<md5file name="zm.png">419a456a86c786662a2e1258ca40b7d5</md5file>
-<md5file name="en.png">89feb1c83c324e468f77f547afd6dcfd</md5file>
-<md5file name="co.png">b5b6c4d5152b8fd193b79201b70dbf4a</md5file>
-<md5file name="bo.png">192002cd9aba7a5237f2ec5a8c8ec267</md5file>
-<md5file name="mw.png">23d92cc0b164d881a2872cbf878f9aea</md5file>
-<md5file name="dm.png">872db466b81af407670160cf7305b3c5</md5file>
-<md5file name="fr.png">7cd3cb27cffdb26ec9bc893879022fa2</md5file>
-<md5file name="bg.png">b4cda49ef47c67fda458c6b7a187d219</md5file>
-<md5file name="er.png">57e8a47fbae98efe3ac2ecebc93bfac0</md5file>
-<md5file name="lc.png">54537764d66c82a60df8647121aae302</md5file>
-<md5file name="dk.png">e46207a40de4c55ebee22d22758c7f07</md5file>
-<md5file name="pf.png">48d1afcf90739c7ac285fbfb9a442f98</md5file>
-<md5file name="cg.png">9d53f377d19984caf020df658621f38b</md5file>
-<md5file name="cc.png">708fe2c3b7aa7192e8cec80f5fcf8ca2</md5file>
-<md5file name="sk.png">206236098ed73e7c9fb4f76c4ec08ea7</md5file>
-<md5file name="cm.png">ffdb8c9ff721c1dc405c07c27b06c44f</md5file>
-<md5file name="pr.png">48180e06410b3f3d59828a1d2f3908d0</md5file>
-<md5file name="bj.png">30720d9dc4dd6183d098a1ef7ca6a515</md5file>
-</dir>
-<dir name="/theme/common" >
-<md5file name="view-refresh.png">caf1836f1e59187b389ccb270a20d3f3</md5file>
-<md5file name="transparent.png">4ea78b1e4b0a34928ec2abc4ba8a1ea1</md5file>
-<md5file name="gmap.png">adfaf6538827b606a08c514b218ce02f</md5file>
-<md5file name="help.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="skype_chatbutton.png">9afdc285279a1dd3e17a321e6d531ddb</md5file>
-<md5file name="skype_callbutton.png">9257a0e2e2099e4060656a32c57b55c2</md5file>
-<md5file name="vcal.gif">5e5649ad914663e345a5099988dbb88d</md5file>
-<md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
-<md5file name="colorpicker.png">73890f2c43db03a3ed7c1f1480a7f2e2</md5file>
-<md5file name="paypal.png">f3ba37478e4e4f5e6025d24a1f649502</md5file>
-</dir>
-<dir name="/theme/common/devices" >
-<md5file name="input-keyboard.png">73c70503cf2dc4a268877aba2bfd95fb</md5file>
-<md5file name="media-optical-dvd.png">9091d512039b8b0e0d8b1a70c4766078</md5file>
-<md5file name="phone.png">a21c063e3ce67f82113249d9a321033d</md5file>
-<md5file name="audio-headset.png">33e3055c8d99a0e108e3dcfafe2f02bf</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="media-optical-audio.png">01a0efb84eadcfc47482e3f36eaa6bdb</md5file>
-<md5file name="audio-card.png">91d7393c46a5a613836330b0f075bbe2</md5file>
-<md5file name="network-wireless-connected-50.png">2056360fe1539188c7e00a09abbc2153</md5file>
-<md5file name="network-wireless-connected-25.png">f1cb6f0bffbc3ca0b63dbbc51f02f5b0</md5file>
-<md5file name="computer-laptop.png">fab2d153ebc8fec58518da89099a3ea7</md5file>
-<md5file name="input-gaming.png">53f8536dae9fd7ddc59dd58e604755a4</md5file>
-<md5file name="cpu.png">662b61d9e2cd1527c749db30c7a84c5e</md5file>
-<md5file name="network-wireless-connected-75.png">e59bace8bc73863ae6abee0fb8e17801</md5file>
-<md5file name="media-floppy.png">52d88dc054798f7076bd0a0c174818db</md5file>
-<md5file name="input-mouse.png">3114409c3a14acff26e9d052a2b345ea</md5file>
-<md5file name="phone-openmoko-freerunner.png">ca177a7f8289f4ab89dfb86769b2eeb9</md5file>
-<md5file name="camera-web.png">4606fbca4fd91f7c6782dbb86e462c12</md5file>
-<md5file name="drive-removable-media-usb-pendrive.png">daadeb6fd24e65df65a8c4f11439927c</md5file>
-<md5file name="drive-removable-media.png">a54e48ba4d68b9b2eb5152aa011f2093</md5file>
-<md5file name="media-optical-video.png">8a8c2bf8fd9bb11318840ebe0fab16cc</md5file>
-<md5file name="network-wireless-connected-00.png">96196defc1997cade2eaaead0ed86ea3</md5file>
-<md5file name="network-wireless-disconnected.png">1c4e7445b1d02e274233de0d43ad6ba0</md5file>
-<md5file name="media-optical-data.png">8e011d62a02604e497d41a6b6d87f201</md5file>
-<md5file name="network-wireless-connected-100.png">b08ede2bec19c7a91a16b7320a571c58</md5file>
-<md5file name="audio-input-microphone.png">fa410dbce8955725b4c6f9ca7a295498</md5file>
-<md5file name="media-flash-smart-media.png">f8e14f44ebadb45a20922f45720e04db</md5file>
-<md5file name="drive-optical.png">c0e8485b73819e041f753b23c7690305</md5file>
-<md5file name="media-flash-sd-mmc.png">2dfe1886aaa2a005ca58b3af4375e404</md5file>
-<md5file name="input-tablet.png">3251c14ead0497ba25cb9746cd1abf52</md5file>
-<md5file name="multimedia-player.png">2cfcc31ebd3600aec994a764e357639e</md5file>
-<md5file name="computer.png">ed0cc9c5c5e4d088be7a1755f07c0bde</md5file>
-<md5file name="network-wireless.png">b08ede2bec19c7a91a16b7320a571c58</md5file>
-<md5file name="media-tape.png">46b9db57d6e0e660bb43663c34e8e183</md5file>
-<md5file name="media-optical-blu-ray.png">35e12c8186c66c2a2f67846325c4a8c9</md5file>
-<md5file name="drive-harddisk.png">472f9ae9fd09507ef6299f2391bdbf4b</md5file>
-<md5file name="pda.png">3ce4d9886ebda3d54fd415961d616cd7</md5file>
-<md5file name="media-flash.png">c9569b7d83a6358e34c6a24e6eb3745c</md5file>
-<md5file name="modem.png">8c49590a520575d276b6a0326149e776</md5file>
-<md5file name="printer-laser.png">67707f51c299f4543c60ef1bb6c7cd45</md5file>
-<md5file name="video-television.png">7fbb218c536d691c6b2d56009f9dadbe</md5file>
-<md5file name="video-projector.png">d4392a1e9591b20a9308663373478137</md5file>
-<md5file name="printer.png">a3d47f5cd664929981c1484d55115ce5</md5file>
-<md5file name="drive-removable-media-usb.png">b8b49d2126b4a75840c876c0175da3e2</md5file>
-<md5file name="media-optical-mixed-cd.png">48703319438cf8bcf4a083ce75582d4e</md5file>
-<md5file name="scanner.png">e8b1b6347c5957cabedcb3318f0178f2</md5file>
-<md5file name="multimedia-player-apple-ipod.png">3ad6532a0682d64f0d1d65d2ce9202d0</md5file>
-<md5file name="media-optical.png">e22fcce83c8d8cfd111e129a3acb8b88</md5file>
-<md5file name="network-wired.png">fc0b12a212a9193b26dd98d1755b96d0</md5file>
-<md5file name="battery.png">42d09f0097af4f8431f883bd161bff25</md5file>
-<md5file name="media-flash-memory-stick.png">704437bd4ad9b8e4f312cb61373555e6</md5file>
-<md5file name="video-display.png">3d667d0964566c0952c7159984118bc3</md5file>
-<md5file name="camera-photo.png">c2f13d2c423baed06d1d6f417b009087</md5file>
-<md5file name="media-optical-dvd-video.png">0e2b3241431a43eaf252f31907d318ae</md5file>
-<md5file name="media-optical-recordable.png">961aeb631f9a41e8401ec7f18a868b3d</md5file>
-<md5file name="audio-input-line.png">7681cab460ea47408a4b60590c3256f5</md5file>
-</dir>
-<dir name="/theme/common" >
-<md5file name="rss.gif">0c77a1573722d25c3a6c1be4a294de22</md5file>
-<md5file name="ical.gif">cb9441c877ca30d9c4cb5fd3dbb4bf1e</md5file>
-<md5file name="folder-new.png">1c43815c33aca84f12c41fa1bf03ac9c</md5file>
-<md5file name="dolistore.jpg">c9498d80aaff704d6dc9cc8703a7d4e9</md5file>
-</dir>
-<dir name="/theme/common/emotes" >
-<md5file name="face-surprise.png">afcb155fbddaa030bf66e006370353b2</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="face-plain.png">e9708940060441ef594907daf7e51c4c</md5file>
-<md5file name="face-smile.png">bd9b10b04302be0e53add9368bd0f05b</md5file>
-<md5file name="face-laugh.png">ec6685dc57f789909eee81e478235dbd</md5file>
-<md5file name="face-angel.png">4650405d73ef5385afa60eea56539fae</md5file>
-<md5file name="face-uncertain.png">a99385ed8f77646021d94ba3facd3a97</md5file>
-<md5file name="face-embarrassed.png">08f95e2a0c68fd61dc33968c49d16a10</md5file>
-<md5file name="face-smile-big.png">1075cabb9ceb8dbdd282ea942a2aae11</md5file>
-<md5file name="face-kiss.png">b5ce0389855bd84afd83bab3343ce427</md5file>
-<md5file name="face-sad.png">b7cfe9e33cab51b6db6b1719b3aef919</md5file>
-<md5file name="face-wink.png">f7a36035b7de1c50116eefeb9ce7ebd9</md5file>
-<md5file name="face-raspberry.png">102806ae9860384fd3574d4ba60ed957</md5file>
-</dir>
-<dir name="/theme/common" >
-<md5file name="information.png">4b3af70f24c7bce743e39a08dc227f19</md5file>
-<md5file name="dolibarr_box.png">6ade7ce02d0e1a57764ca09034e581d8</md5file>
-<md5file name="redstar.png">7921881e4e473d7284ea741addbe8810</md5file>
-</dir>
-<dir name="/theme/common/treemenu" >
-<md5file name="minustop2.gif">71b64eb90d9c86236748d5cddcd936a5</md5file>
-<md5file name="plustop2.gif">588128822d625e390a58f56f3612f907</md5file>
-<md5file name="minustop3.gif">80c455a0847b726d4feef02c6e21c98b</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="minus.gif">beeeedc3193a46c108350c79c818dbef</md5file>
-<md5file name="minusbottom.gif">fb07076002b84c04f14f19c7cf6fe332</md5file>
-<md5file name="linebottom.gif">9445d29997b70a66fbf5e9430db2b49c</md5file>
-<md5file name="plus.gif">228ee6ed67369e1632959a3b26568fbb</md5file>
-<md5file name="plustop.gif">d0ae25b71adb33404ed64bd1a131bfe7</md5file>
-<md5file name="imgfolder.gif">1d488d377762e65ab4e8b691ba01e5a4</md5file>
-<md5file name="page.gif">c25b136c1cb3bb145495c25b35d93754</md5file>
-<md5file name="folder2-expanded.png">851fb8cacaf19c098bc7fd339797948f</md5file>
-<md5file name="plusbottom.gif">7a4337ac238b6eae1362f898c65b4e1d</md5file>
-<md5file name="line.gif">62becd9604eece6fa4ebb00625ba0e71</md5file>
-<md5file name="trash.gif">6cbfd3ed29531044aed9b4edb3cca9ad</md5file>
-<md5file name="minustop.gif">4edfa5cd18f12847054c5a603c345c50</md5file>
-<md5file name="branch.gif">8043b6508f6a876a0ee5cdc266238c98</md5file>
-<md5file name="branchbottom.gif">076db93d2f21b03534bff93f0cb68d33</md5file>
-<md5file name="folder-expanded.gif">be4d3b90a08e3e7370f81557281f346e</md5file>
-<md5file name="folder2.png">fbd3929a893b147ae0940d48d533e023</md5file>
-<md5file name="branchtop.gif">e4f9546a7ec7b751aa49620aecddcb6d</md5file>
-<md5file name="folder.gif">3665b03f0b6b099595415224ccc68285</md5file>
-<md5file name="plustop3.gif">22bea718176473ab099137f013a20550</md5file>
-<md5file name="base.gif">564cf8498bdfe84aa464c7c93c384f41</md5file>
-</dir>
-<dir name="/theme/common/mime" >
-<md5file name="php.png">f1ea44ec38125fab210be1674be67f0e</md5file>
-<md5file name="html.png">395a36af64488793bda90511461c1814</md5file>
-<md5file name="mdb.png">03e2b564224bfb58ff20904bda244043</md5file>
-<md5file name="xls.png">b88670b988d1bfcf10d160c3a5f13401</md5file>
-<md5file name="ppt.png">e997d11209c765632062e4dd60e01007</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="doc.png">cf1cbaab94fb9e593ea0423e8ba4d390</md5file>
-<md5file name="page.png">12ace1a918403049a6d2fc152f53baec</md5file>
-<md5file name="image.png">e217f7a43c29d1ba1baf4fd857565a0b</md5file>
-<md5file name="ooffice.png">b3dd447dfc83ed5da9eac072d9998262</md5file>
-<md5file name="text.png">08e1f9036ad91fd03b3199040a865faf</md5file>
-<md5file name="ttf.png">bdcafc9e164189ba7dda7c7740661f0f</md5file>
-<md5file name="jscript.png">4f252769ae9a32ba0d4e1b27759edbdf</md5file>
-<md5file name="flash.png">8ef569dec9d762a539028f412673116d</md5file>
-<md5file name="encrypt.png">b508411bb915ecf32b1a995644f67fd1</md5file>
-<md5file name="lit.png">29e72d62c835fdac475bba0a45871657</md5file>
-<md5file name="svg.png">d0aec8831504183d456cc4e0de1c399b</md5file>
-<md5file name="css.png">7796308f80795e5f6dacef6ff7a2db2e</md5file>
-<md5file name="dotnet.png">ab89c085311cd936ebf65d70c1dc73a6</md5file>
-<md5file name="jnlp.png">1f6ec0f59547ec12579adcda6581ecc2</md5file>
-<md5file name="video.png">7c28ecf37a5112e346685801e6f7b7ce</md5file>
-<md5file name="pl.png">236333d97d78268677b1575df7c334bb</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="unknown.png">c3812c74bc524179f4ccf5d2db7b3cbf</md5file>
-<md5file name="pdf.png">0ccf49903689d2f274b8c8a91049c8a9</md5file>
-<md5file name="glasses.png">608997bad3fdb828797390380ec80385</md5file>
-<md5file name="other.png">f1d191833ef5609e44f2322622805794</md5file>
-<md5file name="archive.png">33e8113b927871ec7a037f3b84b9ca20</md5file>
-<md5file name="library.png">bfdc0eda7b92250bbc3af11dc4882d99</md5file>
-<md5file name="rss.png">182b591d18dbc56324b1d2099a03ea6b</md5file>
-<md5file name="script.png">f015e173f86b564e9f485af1c5643602</md5file>
-<md5file name="notavailable.png">7d7ce82b25e32e97c09f8e1a25dea530</md5file>
-<md5file name="audio.png">754c92df6977bb4c96bbdd144f967bf4</md5file>
-</dir>
-<dir name="/theme/bureau2crea" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">4e96b9d5e319317867034cb5d44d7edf</md5file>
-</dir>
-<dir name="/theme/bureau2crea/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/bureau2crea/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">a6a0362ae831362830d6e63f1d411527</md5file>
-</dir>
-<dir name="/theme/bureau2crea" >
-<md5file name="graph-color.php">340665046924f127d014eaa81f3ab9ff</md5file>
-<md5file name="thumb.png">fed79fc64fc305b829316f782bcc63d9</md5file>
-</dir>
-<dir name="/theme/bureau2crea/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="object_bookmark.png">f82a70bbaf24434aff018e689e86221b</md5file>
-<md5file name="tick.png">b15fcefe9e55b29cb20d1b1de229edec</md5file>
-<md5file name="view.png">4af4f260359b0ce9c42f77ab47caa6bb</md5file>
-<md5file name="warning.png">c86760866ffe32b359549745a00f78e5</md5file>
-<md5file name="calc.png">8bb0f71417f315eb04c44bf1b07dd157</md5file>
-<md5file name="puce.png">00ff70d955ff73a44e75034c2d58204e</md5file>
-<md5file name="filenew.png">a671cca2c79d9135464aa9f41e78b026</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">cab0ab4445e82168d2cac70036925a88</md5file>
-<md5file name="1leftarrow.png">e9bd2b6f96af06b419608a137f3ffc16</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">67f93528ad1ccf9b8b72651e16c2b83f</md5file>
-<md5file name="stcomm3.png">109a2b54b09935f5a79b887d621533d6</md5file>
-<md5file name="object_book.png">9f011bbff1b13ec5fd8307610210a91e</md5file>
-<md5file name="object_stock.png">5a582fdea5dff2f52a79aaa101278172</md5file>
-<md5file name="object_task.png">b11a03507e5b25abc28f38627259e6c2</md5file>
-<md5file name="history.png">2a2a087b71d3730e58954da48d65b1e0</md5file>
-<md5file name="object_energie.png">bafaa6d8e8c91f79ee22242ef6fd5dc6</md5file>
-<md5file name="2.png">2862f528c2d606a7c780b75613b90761</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">d84ba5e3a285ad25f96eaf0348e96010</md5file>
-<md5file name="bg_tmenu_btnD.jpg">96964e9e7e85840bc46249a5203eaf38</md5file>
-<md5file name="folder.png">618d61f6e80aaea18e3257b4d6cc2728</md5file>
-<md5file name="file.png">4b31ec814f6c455fb7d72f4d32589b3c</md5file>
-<md5file name="1uparrow_selected.png">ea3351e19d493e039b9cf39dc96eedb2</md5file>
-<md5file name="1rightarrow.png">3f9fd57c66f10d599f154a0910fec47c</md5file>
-<md5file name="object_invoice.png">7f073b1e3162a90d38273edab7adac23</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">351226b86bf32c35da86bc84d37710ac</md5file>
-<md5file name="bg-titre-rubrique.png">f69743db39fe49a61499e443879ce394</md5file>
-<md5file name="dolibarr_logo.png">d737ad1c6acf2b8e9cf45c76fa750f4c</md5file>
-<md5file name="close_title.png">fb0e617a4e54b963f7c2139efa874d10</md5file>
-<md5file name="detail.png">cd26e28d19227f52dbb7af6285f49684</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">448c864dda6bfcbb4d6344f5c61a3331</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">f46842235b8299668e3c493ea36de3d8</md5file>
-<md5file name="object_calendarweek.png">4f37eab95abbe47905271558dfe2582f</md5file>
-</dir>
-<dir name="/theme/bureau2crea/img/menus" >
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="company.png">b6ca1dfb745e85d611fbe81cccd4da33</md5file>
-<md5file name="generic4.png">b2fc85cace867cd419febae19227a5b7</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="topmenu_bg_over.gif">5e4cee9e9a747519c7ac8d53b72a1e15</md5file>
-<md5file name="lr_bg.gif">c71ac960b798f1acac68b17b7fa6c803</md5file>
-<md5file name="generic3.png">e186597ccbb2c1eb388198d8d2a199cd</md5file>
-<md5file name="generic1.png">570463ed73e7c93d0989adca95a0d440</md5file>
-<md5file name="members.png">b6342a142293dc8e125d11ea43972d05</md5file>
-<md5file name="products.png">85a06666e72e0c9522deb1041e2bed91</md5file>
-<md5file name="mail.png">b9c630a949e08d2aad90b54cd97276b5</md5file>
-<md5file name="topmenu_bg.gif">ae9923bf8191d4cce6f6aff23d7a92c7</md5file>
-<md5file name="table_bg.gif">e0074fa750edf8fadaabd21713776fe6</md5file>
-<md5file name="topmenu_left.gif">97a2ce5955231c1b3891e8eee2445c62</md5file>
-<md5file name="topmenu_right.gif">f734bdacbce7337ea1b52b95b295c49a</md5file>
-<md5file name="trtitle.png">66657486b605040d066d0dbf6271e14c</md5file>
-<md5file name="pointofsale.png">b22186030a04c7a208dd219acfe203c7</md5file>
-<md5file name="home.png">35df8b42457569b02c19be41abc87f45</md5file>
-<md5file name="generic2.png">ee172f657651ace5f45374cc6a5c3639</md5file>
-<md5file name="agenda.png">22a1d48babdead60060ea6eb841464c3</md5file>
-<md5file name="tools.png">6e4ad58de75dcbd3fe83e4680d5a94d3</md5file>
-<md5file name="toppath.gif">37e28b4e4e22b80c1d39d038599e2dff</md5file>
-<md5file name="footer_bg.jpg">dc22d6ec2bda0707404afaa8259ee219</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="moduletable_th_bg.gif">ea0cd1165069b2c5d4bd5916fe10741d</md5file>
-<md5file name="globe.png">6d28eea8d332c17dda186d63f9ae2206</md5file>
-<md5file name="commercial.png">acc3f08c46b50f9b3b66ea831aadf3ab</md5file>
-<md5file name="project.png">0ff637bde43375a809e583841634f760</md5file>
-<md5file name="ecm.png">83063c2136d912f6cf89a173cf71e7d8</md5file>
-</dir>
-<dir name="/theme/bureau2crea/img" >
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="tmenu.jpg">b5f3d69294c4e3ab14009488fbd8f438</md5file>
-<md5file name="rightarrow.png">53752275e001831a1aa1af926cbdfcbd</md5file>
-<md5file name="bg_btnGrey.jpg">85e75bec7eff5d20e41a993927acb5f7</md5file>
-<md5file name="tmenu_inverse.jpg">28d998536cc67795eb0812a1e4c5a6ed</md5file>
-<md5file name="working2.gif">767c14923c466cadc2b4d21941ea8f59</md5file>
-<md5file name="unlock.png">0ce654c1f24e1190c6c3022435e09ea7</md5file>
-<md5file name="object_email.png">1c1ba7274a1d26029bf89103ca8dd5f2</md5file>
-<md5file name="edit.png">ad8a6bd03901efe7f6d958396fbd5ad1</md5file>
-<md5file name="object_group.png">8e9667450cc2157e1157e8785b367225</md5file>
-<md5file name="split.png">6d457a2c2911dd34f7786ddebec78a4e</md5file>
-<md5file name="nav.jpg">9fe6cd608e8c0099e0aa0c2524b7d8ee</md5file>
-<md5file name="statut0.png">25c9d80f42b34d9dcbfdefdf50cec661</md5file>
-<md5file name="object_technic.png">ae88fbbfc2db402d402b4a1644a06e5d</md5file>
-<md5file name="headbg.jpg">d3dffe4a4ad4030e443985fa8ae1a91b</md5file>
-<md5file name="statut3.png">c533e3d3e66811df956313981c8fdbac</md5file>
-<md5file name="bg_leftCategorie.jpg">e6757cb7e9e8dac57b24af8395a27fdf</md5file>
-<md5file name="object_bill.png">7f073b1e3162a90d38273edab7adac23</md5file>
-<md5file name="on.png">3f933eec8c50faea176b3e58b18a3510</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="bg_tmenusel_btnD.jpg">2da102ab12fb56c79783cd6b776ce9d2</md5file>
-<md5file name="tmenu2.jpg">b48838edc93500f2bc9d4fe8afe1d6be</md5file>
-<md5file name="tmenu3.jpg">034863b5c8459093e35c529af988e293</md5file>
-<md5file name="object_contact_all.png">8799fab2b7f97df4126c466511f7f88b</md5file>
-<md5file name="help.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="object_phoning.png">e2c4129a196854d4e004313b67cabbb1</md5file>
-<md5file name="object_dir.png">913a37ec8bb5444e2aebc3e37ac32f01</md5file>
-<md5file name="object_generic.png">6b4556404cf9104d5f44a0b9a072eb7d</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">85d404bac8dce61b4c6aaa8023b3a56d</md5file>
-<md5file name="test.gif">e2e7935ab2ca6ec4318baf7d9e4db6c1</md5file>
-<md5file name="headbg2.jpg">0bc1e68b3aef15b66b82bc1f4fec9a02</md5file>
-<md5file name="bg_btnBlue.jpg">6ce084d8135a4489f80310f900ffd620</md5file>
-<md5file name="helpdoc.png">1b474f0760ef6d41e1ab690197d6c3b4</md5file>
-<md5file name="object_list.png">de73834d2af73aa83a4f38ff19761f16</md5file>
-<md5file name="object_service.png">f4e4c9fdfa66cac3028c2db1680b46cd</md5file>
-<md5file name="bg_navHorizontal.jpg">ac11d37f3fe11993406e0b1b97f70263</md5file>
-<md5file name="object_contract.png">d3064fa8b7429f42e62da1f2887161d4</md5file>
-<md5file name="bg_connectionBox.jpg">7e68bc36bc8c30dd2d6574ff81f00a64</md5file>
-<md5file name="bg_ssmenu_btnG.jpg">de2022b0af088c7f59b35e323fd6a662</md5file>
-<md5file name="stcomm-1.png">80a22ab091f09fbc6bc59839c61ea516</md5file>
-<md5file name="object_user.png">43d6877df934dd2b5a134e63980008a8</md5file>
-<md5file name="title.gif">82e4a2225d7ef9eb5a0c875f08b76ca9</md5file>
-<md5file name="object_billr.png">b28a87c8e679b0340ca2bb5e6bf5f6df</md5file>
-<md5file name="mainlevel.gif">7cce79ebd74e8f71ce17f811dee41f34</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">8c851baa2cdfee2a5db7142700b8653c</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">43926a83973951e9b41d8c0aab0e2cd3</md5file>
-<md5file name="sort_asc_disabled.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="button_edit.png">19e9a1da7c2e79b9b4d18cb4224bf018</md5file>
-<md5file name="star.png">b61cf71e2798c651c607f48940a4e09f</md5file>
-<md5file name="vcard.png">fde64db4462dcd2dd78d40ac1e490286</md5file>
-<md5file name="1leftarrow_selected.png">e9cfe12959cf2221fca30764b9e335bc</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="object_address.png">47efc87b5dd14b2464b2403e038d03f9</md5file>
-<md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
-<md5file name="object_category.png">5a582fdea5dff2f52a79aaa101278172</md5file>
-<md5file name="1downarrow.png">067a4741fa4798555fa9f528c95d6a18</md5file>
-<md5file name="bg_centerBlock-title2.jpg">549e5f42a9f20bab9fc991b9c74bbb7e</md5file>
-<md5file name="uparrow.png">b3f7fd8c8d2d111960bc1ce63edd8d70</md5file>
-<md5file name="bg_mainNav.jpg">5f8d5884338de38e204a4064409de3c6</md5file>
-<md5file name="previous.png">db95c9c78a2b762361c7c2c9c1195145</md5file>
-<md5file name="edit_add.png">8a7351ef099da26bbaa63ade1ada8be9</md5file>
-<md5file name="statut1.png">deb4efac7c2229e79dfac38516e78fb2</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">5ff452c2f13647b0f60f9dad9ca3ba21</md5file>
-<md5file name="object_category-expanded.png">f17b1318317516348f82385cc233ff0b</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">1c5563470e1e0a9a6d693d8b00133b81</md5file>
-<md5file name="object_trip.png">7d46d18692c2c3210ae658b71d6d95c2</md5file>
-<md5file name="1downarrow_selected.png">30f79c75465c3f1e855a3130c1abb350</md5file>
-<md5file name="pdf3.png">946e88d5612bd35d2f9297a1419ba62c</md5file>
-<md5file name="filter.png">5e83bbea91f6deaa37b247ac013ef556</md5file>
-<md5file name="bg_vmenu.jpg">c17a32a624ef386aacdbc3a683f32048</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">dad81862c0f72751d6a69a7baf0c851f</md5file>
-<md5file name="reload.png">26b7b52cf3e0d7132dd00290a55a3192</md5file>
-<md5file name="bg_tmenu.jpg">f7a04f85dd2d738d83f066800862de7d</md5file>
-<md5file name="folder-open.png">aba33e5e98071280db0d34c42349f1bf</md5file>
-<md5file name="object_search.png">acf42861a59faad7e9c5fd30cd9cfd70</md5file>
-</dir>
-<dir name="/theme/bureau2crea/img/bouton" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="round_black_tr.png">ba1534f65c09d9e2f771405acc34e47d</md5file>
-<md5file name="menu_l_title_bg.png">6964848f5af43d68c6b7218d3d3804f2</md5file>
-</dir>
-<dir name="/theme/bureau2crea/img" >
-<md5file name="addfile.png">90eb802715ce63e5e3ca4a55a42b8397</md5file>
-<md5file name="grip_title.png">810dab21a178dd4bd8acbf6c0741d2cd</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="bg_btn_green.jpg">275999a532356c158f19fd8a2b06d399</md5file>
-<md5file name="searchclear.png">441617b20516fd76a40c7ff1b11690cf</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="cron.png">33c4116fccc3ff06e1c82060d90c1aac</md5file>
-<md5file name="object_sending.png">765e3ee60bd9940d57172336fb3ef5aa</md5file>
-<md5file name="object_company.png">7c26f8ac117a0a43f236900481e8781e</md5file>
-<md5file name="bg_tmenusel_btnG.jpg">f061264590a29149c75e58a2430e118d</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="bg_tmenu_btnG.jpg">0fc42aae027e045136cedefbffb61058</md5file>
-<md5file name="bg_working_table.jpg">d19b64d5c33563f03415fb80e3d390a3</md5file>
-<md5file name="statut7.png">34a3ff119b0f6f13a3cefab63a8b7cc3</md5file>
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-<md5file name="object_calendarday.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="bg_inside.gif">ba1629cc343a821009875fcc3d23afb0</md5file>
-<md5file name="bg_leftMenu.jpg">5e5a5a366e1296a73953a5a52885a6a5</md5file>
-<md5file name="body_bg.jpg">5d3b6699db4bdb0b80adcb87bca2cbda</md5file>
-<md5file name="title.png">9fe6aca4313338fe6dfb496ee6a37745</md5file>
-<md5file name="call_out.png">a346bdb285fe8580f4b5b8dd5f5451ef</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">c8a144d7c8add753a44e8e8d55595570</md5file>
-<md5file name="stcomm1.png">24b51f9de5784485dad0951515dfeb6c</md5file>
-<md5file name="calendar.png">f6c51890eb3d84defb470c9101e0e1fa</md5file>
-<md5file name="object_contact.png">7df3d6c0f7590453f08e362b6ce20940</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="printer.png">5fdd9b86b6f8470c71db5a04bcb9e11b</md5file>
-<md5file name="disable.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="editdelete.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="object_intervention.png">8786aa827e5b8b29badd2db51d893349</md5file>
-<md5file name="bg_ssmenusel_btnD.jpg">7048b07a1e0e0fde5c6a1b4d756d10b6</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="object_payment.png">a9c1b094e5f90641184b3cedc1b2b372</md5file>
-<md5file name="stats.png">c5f9a0849fc60d9d903496e6752a8961</md5file>
-<md5file name="lock.png">a65c4d66168635b87ecbc720e2a50703</md5file>
-<md5file name="redstar.png">16f15b5dcb1b133a53de211c024611e2</md5file>
-<md5file name="object_billd.png">3f4c833d31becf6c023f35d3a8140ca8</md5file>
-<md5file name="object_product.png">f4e4c9fdfa66cac3028c2db1680b46cd</md5file>
-<md5file name="statut9.png">752f4b5e92e81b70cae0ddc1be19e468</md5file>
-<md5file name="bg-bas-rubrique.png">5dffe1f2fb151b5ae395df7c0a8e7b15</md5file>
-<md5file name="search.png">3f995da98d36a1ccea1ed8fec6b9f4ca</md5file>
-<md5file name="bg_other_table.jpg">798ed84c7b3f98e34a5aa55074cd2616</md5file>
-<md5file name="statut5.png">deb4efac7c2229e79dfac38516e78fb2</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">7714b390ff497c388fbdcfe8c0563790</md5file>
-<md5file name="bg-rubrique.png">c7701209d9f6520754d641090de4ae63</md5file>
-<md5file name="bg_btnGreen.jpg">3a30e6c5fd016911b03b23ad8ddb7600</md5file>
-<md5file name="banner_02.jpg">ec291d015307e2d4798886aaf95677ae</md5file>
-<md5file name="object_billa.png">c39899fd27e0b323e6b1c026e9a9359f</md5file>
-<md5file name="object_calendar.png">222b20d8427161e4a655b346014e0408</md5file>
-<md5file name="object_project.png">1059848b00093780cd84ab5e45d47c17</md5file>
-<md5file name="bg_btn_blue.jpg">7791ec67383f276b58e5f8f3c32409bb</md5file>
-<md5file name="object_phoning_fax.png">e2c4129a196854d4e004313b67cabbb1</md5file>
-<md5file name="sort_asc.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="object_order.png">e945c933045b11d928443a45decf52ad</md5file>
-<md5file name="bg_btn_red.jpg">5f7594cc680f9f8e39152b67ee04d492</md5file>
-<md5file name="close.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="bg_ssmenusel_btnG.jpg">2d042b078ffb9cf4e0321fe8a09cfa88</md5file>
-<md5file name="edit_remove.png">e1d238ddd4e573b085cc34b028b24883</md5file>
-<md5file name="indent1.png">ecad6bd4ba98051aa8d375b71b0e116e</md5file>
-<md5file name="gradient.gif">a03c8d2492d0ca2404593ec71b479eaf</md5file>
-<md5file name="object_globe.png">1ba2c9d892264fe1db8eefb1ecd3bb8a</md5file>
-<md5file name="statut6.png">6959d7207e6206827d65ddd355ba7506</md5file>
-<md5file name="object_propal.png">77bde3efa7443489764569752b420eb1</md5file>
-<md5file name="info.png">98cf56f3f039afe645291a4f8d232d5f</md5file>
-<md5file name="recent.png">0c4097fb424dfb257639732a19e5c2ed</md5file>
-<md5file name="bg_btnRed.jpg">76b75be7fb2191b64616144f1bb6f324</md5file>
-<md5file name="stcomm4.png">79a72d08df258b0ca33c240c1d7746c5</md5file>
-<md5file name="object_reduc.png">f48adb959a22f1724228581645cd9e67</md5file>
-<md5file name="object_account.png">86ff89b103a31b41474b61e5a506c2b5</md5file>
-<md5file name="object_margin.png">c6a9a7d9cc31a6f650c60a8012a0d0d3</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">670fcc17fec05077d89269efc0ca2a0e</md5file>
-<md5file name="stcomm2.png">2ebaedcb9d2d969084625077785cc38d</md5file>
-<md5file name="off.png">35376294d8fe982540141abbb4d1714b</md5file>
-<md5file name="bg_centerBlock-title.jpg">bbe819e048ea168b6c16444dba907c40</md5file>
-<md5file name="object_projecttask.png">1ac87d92900f2a381db91de8cdf0dd46</md5file>
-<md5file name="statut8.png">4a436addc8ecc176da90d6f8e7ca0a8a</md5file>
-<md5file name="button_bg.png">115c4806f36aeb531699b370720312c4</md5file>
-<md5file name="delete.png">55418df59f5b95c989be04f945a0002a</md5file>
-<md5file name="statut4.png">78cc1dbd8731c1e9f37be87885a916ec</md5file>
-<md5file name="bg_ssmenu_btnD.jpg">64d3e67ba4a87e02faa08fcb6d92d628</md5file>
-</dir>
-<dir name="/theme" >
-<md5file name="dolibarr_preferred_partner_int.png">ed715e949601b59d8aa1cae4915e53d5</md5file>
-</dir>
-<dir name="/theme/cameleo" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">1fbe45ac17223930f63f72b33108f3be</md5file>
-</dir>
-<dir name="/theme/cameleo/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/cameleo/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">a6a0362ae831362830d6e63f1d411527</md5file>
-</dir>
-<dir name="/theme/cameleo" >
-<md5file name="graph-color.php">4e43b862976f2b1a0f0d0d7a5dba9d19</md5file>
-<md5file name="thumb.png">ad54dd3c9b754980becf7ecc311038fc</md5file>
-</dir>
-<dir name="/theme/cameleo/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="object_bookmark.png">f82a70bbaf24434aff018e689e86221b</md5file>
-<md5file name="tick.png">b15fcefe9e55b29cb20d1b1de229edec</md5file>
-<md5file name="view.png">4af4f260359b0ce9c42f77ab47caa6bb</md5file>
-<md5file name="blue-dot.png">a79fba50514b6341e89f4cfab2538074</md5file>
-<md5file name="warning.png">c86760866ffe32b359549745a00f78e5</md5file>
-<md5file name="calc.png">8bb0f71417f315eb04c44bf1b07dd157</md5file>
-<md5file name="puce.png">00ff70d955ff73a44e75034c2d58204e</md5file>
-<md5file name="filenew.png">a671cca2c79d9135464aa9f41e78b026</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">cab0ab4445e82168d2cac70036925a88</md5file>
-<md5file name="object_lead.png">913a37ec8bb5444e2aebc3e37ac32f01</md5file>
-<md5file name="1leftarrow.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">67f93528ad1ccf9b8b72651e16c2b83f</md5file>
-<md5file name="stcomm3.png">131e9c1492e737f2c9ec974ca6266f1a</md5file>
-<md5file name="object_book.png">9f011bbff1b13ec5fd8307610210a91e</md5file>
-<md5file name="object_stock.png">c1c1d802683b4599c4cfce0ddfe6be0d</md5file>
-<md5file name="object_task.png">b11a03507e5b25abc28f38627259e6c2</md5file>
-<md5file name="history.png">2a2a087b71d3730e58954da48d65b1e0</md5file>
-<md5file name="object_energie.png">bafaa6d8e8c91f79ee22242ef6fd5dc6</md5file>
-<md5file name="2.png">2862f528c2d606a7c780b75613b90761</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">c78c3ce42e3987678f28f5c2d5888a31</md5file>
-<md5file name="bg_tmenu_btnD.jpg">879bcc7a49c8a8b2dd20672d7fece36f</md5file>
-<md5file name="folder.png">618d61f6e80aaea18e3257b4d6cc2728</md5file>
-<md5file name="file.png">4b31ec814f6c455fb7d72f4d32589b3c</md5file>
-<md5file name="1uparrow_selected.png">4b35eb7636936f48c6d40353135af307</md5file>
-<md5file name="1rightarrow.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="object_invoice.png">7f073b1e3162a90d38273edab7adac23</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">351226b86bf32c35da86bc84d37710ac</md5file>
-<md5file name="bg-titre-rubrique.png">f69743db39fe49a61499e443879ce394</md5file>
-<md5file name="close_title.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="detail.png">cd26e28d19227f52dbb7af6285f49684</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">448c864dda6bfcbb4d6344f5c61a3331</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">f46842235b8299668e3c493ea36de3d8</md5file>
-<md5file name="object_calendarweek.png">4f37eab95abbe47905271558dfe2582f</md5file>
-</dir>
-<dir name="/theme/cameleo/img/menus" >
-<md5file name="holiday.png">8d14d57b64e6d0941a4a3da42485c835</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="company.png">b6ca1dfb745e85d611fbe81cccd4da33</md5file>
-<md5file name="generic4.png">b2fc85cace867cd419febae19227a5b7</md5file>
-<md5file name="bank.png">73936e9491424f1091d860da60e70a7e</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="topmenu_bg_over.gif">5e4cee9e9a747519c7ac8d53b72a1e15</md5file>
-<md5file name="lr_bg.gif">c71ac960b798f1acac68b17b7fa6c803</md5file>
-<md5file name="generic3.png">e186597ccbb2c1eb388198d8d2a199cd</md5file>
-<md5file name="generic1.png">570463ed73e7c93d0989adca95a0d440</md5file>
-<md5file name="members.png">b6342a142293dc8e125d11ea43972d05</md5file>
-<md5file name="products.png">85a06666e72e0c9522deb1041e2bed91</md5file>
-<md5file name="mail.png">b9c630a949e08d2aad90b54cd97276b5</md5file>
-<md5file name="topmenu_bg.gif">ae9923bf8191d4cce6f6aff23d7a92c7</md5file>
-<md5file name="table_bg.gif">e0074fa750edf8fadaabd21713776fe6</md5file>
-<md5file name="topmenu_left.gif">97a2ce5955231c1b3891e8eee2445c62</md5file>
-<md5file name="topmenu_right.gif">f734bdacbce7337ea1b52b95b295c49a</md5file>
-<md5file name="trtitle.png">74107c8827b62bfb576c7525db0c50d4</md5file>
-<md5file name="pointofsale.png">b22186030a04c7a208dd219acfe203c7</md5file>
-<md5file name="home.png">35df8b42457569b02c19be41abc87f45</md5file>
-<md5file name="generic2.png">ee172f657651ace5f45374cc6a5c3639</md5file>
-<md5file name="agenda.png">22a1d48babdead60060ea6eb841464c3</md5file>
-<md5file name="tools.png">6e4ad58de75dcbd3fe83e4680d5a94d3</md5file>
-<md5file name="toppath.gif">37e28b4e4e22b80c1d39d038599e2dff</md5file>
-<md5file name="footer_bg.jpg">dc22d6ec2bda0707404afaa8259ee219</md5file>
-<md5file name="externalsite.png">f4a0423781100f09efb4546515878611</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="moduletable_th_bg.gif">ea0cd1165069b2c5d4bd5916fe10741d</md5file>
-<md5file name="globe.png">6d28eea8d332c17dda186d63f9ae2206</md5file>
-<md5file name="commercial.png">acc3f08c46b50f9b3b66ea831aadf3ab</md5file>
-<md5file name="project.png">0ff637bde43375a809e583841634f760</md5file>
-<md5file name="ecm.png">83063c2136d912f6cf89a173cf71e7d8</md5file>
-</dir>
-<dir name="/theme/cameleo/img" >
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="rightarrow.png">53752275e001831a1aa1af926cbdfcbd</md5file>
-<md5file name="bg_btnGrey.jpg">85e75bec7eff5d20e41a993927acb5f7</md5file>
-<md5file name="working2.gif">767c14923c466cadc2b4d21941ea8f59</md5file>
-<md5file name="bg_leftTable.jpg">9d0a732a0ddc0c0ad033e1cae7e8e1ce</md5file>
-<md5file name="unlock.png">0ce654c1f24e1190c6c3022435e09ea7</md5file>
-<md5file name="object_email.png">9a58dc01b905407823d94c3099ea0c44</md5file>
-<md5file name="edit.png">ab59944ef4c329f4d5c3109775c61f5b</md5file>
-<md5file name="object_group.png">8e9667450cc2157e1157e8785b367225</md5file>
-<md5file name="stcomm7.png">b3d6f3785d8cfecff48833b17b56ccdd</md5file>
-<md5file name="split.png">6d457a2c2911dd34f7786ddebec78a4e</md5file>
-<md5file name="statut0.png">25c9d80f42b34d9dcbfdefdf50cec661</md5file>
-<md5file name="object_event.png">8e9667450cc2157e1157e8785b367225</md5file>
-<md5file name="object_technic.png">16bb485a90ed5d40b877f42ae2c1e6fd</md5file>
-<md5file name="bg_leftCategorie2.jpg">732ded5dbab1e25ec84bb0d1d021b840</md5file>
-<md5file name="headbg.jpg">d3dffe4a4ad4030e443985fa8ae1a91b</md5file>
-<md5file name="statut3.png">c533e3d3e66811df956313981c8fdbac</md5file>
-<md5file name="bg_leftCategorie.jpg">e6757cb7e9e8dac57b24af8395a27fdf</md5file>
-<md5file name="object_bill.png">7f073b1e3162a90d38273edab7adac23</md5file>
-<md5file name="on.png">3f933eec8c50faea176b3e58b18a3510</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="bg_tmenusel_btnD.jpg">809e6f0b71137a2d0d489ef24a383bf7</md5file>
-<md5file name="object_contact_all.png">8e9667450cc2157e1157e8785b367225</md5file>
-<md5file name="help.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="object_phoning.png">e2c4129a196854d4e004313b67cabbb1</md5file>
-<md5file name="object_dir.png">913a37ec8bb5444e2aebc3e37ac32f01</md5file>
-<md5file name="object_generic.png">40132ecffc9bec07aafcc30c6286078a</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">85d404bac8dce61b4c6aaa8023b3a56d</md5file>
-<md5file name="bouton_edit.png">9c85a247cd59245d62ad33a6f6d8021a</md5file>
-<md5file name="test.gif">e2e7935ab2ca6ec4318baf7d9e4db6c1</md5file>
-<md5file name="headbg2.jpg">0bc1e68b3aef15b66b82bc1f4fec9a02</md5file>
-<md5file name="bg_btnBlue.jpg">ddf9cf9d441de3934800e1a2cec8af0e</md5file>
-<md5file name="helpdoc.png">1b474f0760ef6d41e1ab690197d6c3b4</md5file>
-<md5file name="object_list.png">9bbcc89b736a13147aaa5aa74b4a0440</md5file>
-<md5file name="object_service.png">1051c422df2cc6f77c4cb08eebf9a222</md5file>
-<md5file name="object_contract.png">d3064fa8b7429f42e62da1f2887161d4</md5file>
-<md5file name="bg_ssmenu_btnG.jpg">de2022b0af088c7f59b35e323fd6a662</md5file>
-<md5file name="stcomm-1.png">b5d06e9bd03f50a951e4c5ed8d67a9b0</md5file>
-<md5file name="object_user.png">43d6877df934dd2b5a134e63980008a8</md5file>
-<md5file name="object_billr.png">b28a87c8e679b0340ca2bb5e6bf5f6df</md5file>
-<md5file name="mainlevel.gif">7cce79ebd74e8f71ce17f811dee41f34</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">07001b443cc63071e2a368efeecc9ad3</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">43926a83973951e9b41d8c0aab0e2cd3</md5file>
-<md5file name="sort_asc_disabled.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="object_leadpub.png">8e9667450cc2157e1157e8785b367225</md5file>
-<md5file name="star.png">b61cf71e2798c651c607f48940a4e09f</md5file>
-<md5file name="vcard.png">fde64db4462dcd2dd78d40ac1e490286</md5file>
-<md5file name="1leftarrow_selected.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="red-dot.png">94a9153db495781ee4c317420202a2be</md5file>
-<md5file name="stcomm9.png">e496a23a58f66890e5c69e7a1699aa2d</md5file>
-<md5file name="object_address.png">47efc87b5dd14b2464b2403e038d03f9</md5file>
-<md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
-<md5file name="object_category.png">5a582fdea5dff2f52a79aaa101278172</md5file>
-<md5file name="1downarrow.png">c2664fbfabe5322a1a136ef9e6ec28db</md5file>
-<md5file name="stcomm6.png">d8aedd7beecf9e743f5f49cc11429c0f</md5file>
-<md5file name="bg_liste_titremenu.jpg">ed3a68794bbf31b3c2de610200b5a92e</md5file>
-<md5file name="uparrow.png">b3f7fd8c8d2d111960bc1ce63edd8d70</md5file>
-<md5file name="previous.png">db95c9c78a2b762361c7c2c9c1195145</md5file>
-<md5file name="green-dot.png">cd5792374200bfcb7337e03e45454e50</md5file>
-<md5file name="edit_add.png">8a7351ef099da26bbaa63ade1ada8be9</md5file>
-<md5file name="statut1.png">deb4efac7c2229e79dfac38516e78fb2</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">5ff452c2f13647b0f60f9dad9ca3ba21</md5file>
-<md5file name="object_category-expanded.png">f17b1318317516348f82385cc233ff0b</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="object_trip.png">70becbe01e0a3028bc1f911d157502fb</md5file>
-<md5file name="1downarrow_selected.png">f933a0d4e4f4a2f465d48977a62f71b0</md5file>
-<md5file name="pdf3.png">946e88d5612bd35d2f9297a1419ba62c</md5file>
-<md5file name="filter.png">5e83bbea91f6deaa37b247ac013ef556</md5file>
-<md5file name="bg_vmenu.jpg">c17a32a624ef386aacdbc3a683f32048</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">b57af4b9947810d411c878d3e9caa276</md5file>
-<md5file name="reload.png">26b7b52cf3e0d7132dd00290a55a3192</md5file>
-<md5file name="bg_tmenu.jpg">bb0fbf39951397d1d3737a3d7006d18e</md5file>
-<md5file name="folder-open.png">aba33e5e98071280db0d34c42349f1bf</md5file>
-<md5file name="object_search.png">acf42861a59faad7e9c5fd30cd9cfd70</md5file>
-</dir>
-<dir name="/theme/cameleo/img/bouton" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="round_black_tr.png">ba1534f65c09d9e2f771405acc34e47d</md5file>
-<md5file name="menu_l_title_bg.png">6964848f5af43d68c6b7218d3d3804f2</md5file>
-</dir>
-<dir name="/theme/cameleo/img" >
-<md5file name="addfile.png">90eb802715ce63e5e3ca4a55a42b8397</md5file>
-<md5file name="grip_title.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="bg_btn_green.jpg">275999a532356c158f19fd8a2b06d399</md5file>
-<md5file name="searchclear.png">441617b20516fd76a40c7ff1b11690cf</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="cron.png">33c4116fccc3ff06e1c82060d90c1aac</md5file>
-<md5file name="object_sending.png">765e3ee60bd9940d57172336fb3ef5aa</md5file>
-<md5file name="object_company.png">7c26f8ac117a0a43f236900481e8781e</md5file>
-<md5file name="bg_tmenusel_btnG.jpg">ed7f8a63c16ca6f732b8794ff0cc2d28</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="bg_tmenu_btnG.jpg">8af57d97c02aadd073dc0c67d2546a9c</md5file>
-<md5file name="bg_working_table.jpg">1d2a82296a2da8e75073715f5b30c93f</md5file>
-<md5file name="statut7.png">c533e3d3e66811df956313981c8fdbac</md5file>
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-<md5file name="object_calendarday.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="bg_inside.gif">ba1629cc343a821009875fcc3d23afb0</md5file>
-<md5file name="bg_leftMenu.jpg">02c9db9f7c03e235dacf85a337b8887b</md5file>
-<md5file name="body_bg.jpg">5d3b6699db4bdb0b80adcb87bca2cbda</md5file>
-<md5file name="title.png">9fe6aca4313338fe6dfb496ee6a37745</md5file>
-<md5file name="call_out.png">a346bdb285fe8580f4b5b8dd5f5451ef</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">c8a144d7c8add753a44e8e8d55595570</md5file>
-<md5file name="stcomm1.png">c48848adc73b20b6a2e52888c8a7f9f9</md5file>
-<md5file name="1updownarrow.png">4ab5cf779b6ba8737731bd949438e279</md5file>
-<md5file name="calendar.png">f6c51890eb3d84defb470c9101e0e1fa</md5file>
-<md5file name="object_contact.png">7df3d6c0f7590453f08e362b6ce20940</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="object_stat.png">44854c50928080752b377841ec269639</md5file>
-<md5file name="printer.png">5fdd9b86b6f8470c71db5a04bcb9e11b</md5file>
-<md5file name="disable.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="editdelete.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="object_intervention.png">8782f385cdddac89c3704c05a8a7ac7a</md5file>
-<md5file name="bg_ssmenusel_btnD.jpg">7048b07a1e0e0fde5c6a1b4d756d10b6</md5file>
-<md5file name="stcomm5.png">c533e3d3e66811df956313981c8fdbac</md5file>
-<md5file name="stcomm10.png">ab99e28fc193ffaeee2c33dde09bf167</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="object_payment.png">a9c1b094e5f90641184b3cedc1b2b372</md5file>
-<md5file name="bg_ListeTitrelong.jpg">c0354a0f9fc6655fc9323757e9e0b742</md5file>
-<md5file name="stats.png">c5f9a0849fc60d9d903496e6752a8961</md5file>
-<md5file name="lock.png">a65c4d66168635b87ecbc720e2a50703</md5file>
-<md5file name="redstar.png">16f15b5dcb1b133a53de211c024611e2</md5file>
-<md5file name="object_billd.png">3f4c833d31becf6c023f35d3a8140ca8</md5file>
-<md5file name="object_product.png">f4e4c9fdfa66cac3028c2db1680b46cd</md5file>
-<md5file name="statut9.png">25c9d80f42b34d9dcbfdefdf50cec661</md5file>
-<md5file name="bg-bas-rubrique.png">5dffe1f2fb151b5ae395df7c0a8e7b15</md5file>
-<md5file name="search.png">3f995da98d36a1ccea1ed8fec6b9f4ca</md5file>
-<md5file name="bg_other_table.jpg">798ed84c7b3f98e34a5aa55074cd2616</md5file>
-<md5file name="statut5.png">deb4efac7c2229e79dfac38516e78fb2</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">7714b390ff497c388fbdcfe8c0563790</md5file>
-<md5file name="bg-rubrique.png">c7701209d9f6520754d641090de4ae63</md5file>
-<md5file name="bg_btnGreen.jpg">5162c215a01d7254e1eba6755450a163</md5file>
-<md5file name="banner_02.jpg">ec291d015307e2d4798886aaf95677ae</md5file>
-<md5file name="object_billa.png">c39899fd27e0b323e6b1c026e9a9359f</md5file>
-<md5file name="object_calendar.png">222b20d8427161e4a655b346014e0408</md5file>
-<md5file name="object_project.png">913a37ec8bb5444e2aebc3e37ac32f01</md5file>
-<md5file name="bg_btn_blue.jpg">7791ec67383f276b58e5f8f3c32409bb</md5file>
-<md5file name="object_phoning_fax.png">e2c4129a196854d4e004313b67cabbb1</md5file>
-<md5file name="sort_asc.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="object_order.png">e945c933045b11d928443a45decf52ad</md5file>
-<md5file name="bg_btn_red.jpg">5f7594cc680f9f8e39152b67ee04d492</md5file>
-<md5file name="close.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="bg_ssmenusel_btnG.jpg">2d042b078ffb9cf4e0321fe8a09cfa88</md5file>
-<md5file name="edit_remove.png">e1d238ddd4e573b085cc34b028b24883</md5file>
-<md5file name="indent1.png">ecad6bd4ba98051aa8d375b71b0e116e</md5file>
-<md5file name="gradient.gif">a03c8d2492d0ca2404593ec71b479eaf</md5file>
-<md5file name="object_globe.png">1ba2c9d892264fe1db8eefb1ecd3bb8a</md5file>
-<md5file name="statut6.png">6959d7207e6206827d65ddd355ba7506</md5file>
-<md5file name="object_propal.png">77bde3efa7443489764569752b420eb1</md5file>
-<md5file name="info.png">98cf56f3f039afe645291a4f8d232d5f</md5file>
-<md5file name="recent.png">0c4097fb424dfb257639732a19e5c2ed</md5file>
-<md5file name="bg_btnRed.jpg">76b75be7fb2191b64616144f1bb6f324</md5file>
-<md5file name="stcomm4.png">ed08dbc09e01bfa10b36e7b6ed8bf9d3</md5file>
-<md5file name="object_reduc.png">f48adb959a22f1724228581645cd9e67</md5file>
-<md5file name="object_account.png">30840a6ccd63f38c28920cadb162e188</md5file>
-<md5file name="object_margin.png">c6a9a7d9cc31a6f650c60a8012a0d0d3</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">670fcc17fec05077d89269efc0ca2a0e</md5file>
-<md5file name="stcomm2.png">9d3d0f55c282fc3544043027b119cf37</md5file>
-<md5file name="off.png">35376294d8fe982540141abbb4d1714b</md5file>
-<md5file name="bg_centerBlock-title.jpg">96ac8ec152e9815e48efdf383dd7e209</md5file>
-<md5file name="object_projecttask.png">1ac87d92900f2a381db91de8cdf0dd46</md5file>
-<md5file name="statut8.png">d8aedd7beecf9e743f5f49cc11429c0f</md5file>
-<md5file name="button_bg.png">115c4806f36aeb531699b370720312c4</md5file>
-<md5file name="delete.png">55418df59f5b95c989be04f945a0002a</md5file>
-<md5file name="stcomm8.png">061e57284f369a77f4ab7a210edd6d16</md5file>
-<md5file name="statut4.png">6959d7207e6206827d65ddd355ba7506</md5file>
-<md5file name="bg_ssmenu_btnD.jpg">64d3e67ba4a87e02faa08fcb6d92d628</md5file>
-</dir>
-<dir name="/theme/auguria" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">01232047a4537a7eca790bf2e64eac10</md5file>
-</dir>
-<dir name="/theme/auguria/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/auguria/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">a6a0362ae831362830d6e63f1d411527</md5file>
-</dir>
-<dir name="/theme/auguria" >
-<md5file name="graph-color.php">16e262f3f18cf7836e231b64a353af7f</md5file>
-<md5file name="thumb.png">715f17cd829260420265f6d293640e04</md5file>
-</dir>
-<dir name="/theme/auguria/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="object_bookmark.png">2a82b000df718dd6e6770e2d50b03862</md5file>
-<md5file name="tick.png">445b34b4ac5dbd8cbdbb2d8d52656cab</md5file>
-<md5file name="view.png">4af4f260359b0ce9c42f77ab47caa6bb</md5file>
-<md5file name="warning.png">f1d99169e9f6f6e4880a4f2859b53858</md5file>
-<md5file name="calc.png">8bb0f71417f315eb04c44bf1b07dd157</md5file>
-<md5file name="puce.png">e7e6b8d7a9b989619beabe01cdff3bb2</md5file>
-<md5file name="filenew.png">a671cca2c79d9135464aa9f41e78b026</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">1e99a575dd2737b28288144382810210</md5file>
-<md5file name="1leftarrow.png">92dfb008bc785eaac8dd2878e17f4a31</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">b3ef3d72a6836a5291a0487307b5d8f6</md5file>
-<md5file name="stcomm3.png">131e9c1492e737f2c9ec974ca6266f1a</md5file>
-<md5file name="object_book.png">bf5474e7c85243d85f6ce742204bb692</md5file>
-<md5file name="object_stock.png">7d389b04b1d62e932d0e2696c7e68e9d</md5file>
-<md5file name="object_task.png">287ac7dbd72c235345b20a09e93f4df4</md5file>
-<md5file name="history.png">2a2a087b71d3730e58954da48d65b1e0</md5file>
-<md5file name="object_energie.png">71042cbc4ea8acafe754fb436feff958</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">a78a833c5c28843ef5c49dfa04c1c970</md5file>
-<md5file name="folder.png">618d61f6e80aaea18e3257b4d6cc2728</md5file>
-<md5file name="file.png">4b31ec814f6c455fb7d72f4d32589b3c</md5file>
-<md5file name="1uparrow_selected.png">b3b82d32ad1e02b6be3078a24ef8b28e</md5file>
-<md5file name="1rightarrow.png">9c419b4fa2cd1c7ad6772cbb28934b51</md5file>
-<md5file name="object_invoice.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">351226b86bf32c35da86bc84d37710ac</md5file>
-<md5file name="bg-titre-rubrique.png">7695d1ec2dcfe45c3f713cf420f707c1</md5file>
-<md5file name="close_title.png">fb0e617a4e54b963f7c2139efa874d10</md5file>
-<md5file name="detail.png">cd26e28d19227f52dbb7af6285f49684</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">c5e70aa4ca496434dce0517017aa787e</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">a6879b7e59ccb7926635047f0c736b05</md5file>
-<md5file name="object_calendarweek.png">4f37eab95abbe47905271558dfe2582f</md5file>
-</dir>
-<dir name="/theme/auguria/img/menus" >
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="company.png">b6ca1dfb745e85d611fbe81cccd4da33</md5file>
-<md5file name="generic4.png">b2fc85cace867cd419febae19227a5b7</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="topmenu_bg_over.gif">5e4cee9e9a747519c7ac8d53b72a1e15</md5file>
-<md5file name="lr_bg.gif">c71ac960b798f1acac68b17b7fa6c803</md5file>
-<md5file name="topmenu_right.png">1ade3d7773887c7f5089096d1afec3eb</md5file>
-<md5file name="generic3.png">e186597ccbb2c1eb388198d8d2a199cd</md5file>
-<md5file name="generic1.png">570463ed73e7c93d0989adca95a0d440</md5file>
-<md5file name="members.png">b6342a142293dc8e125d11ea43972d05</md5file>
-<md5file name="products.png">85a06666e72e0c9522deb1041e2bed91</md5file>
-<md5file name="mail.png">b9c630a949e08d2aad90b54cd97276b5</md5file>
-<md5file name="table_bg.gif">e0074fa750edf8fadaabd21713776fe6</md5file>
-<md5file name="topmenu_left.gif">97a2ce5955231c1b3891e8eee2445c62</md5file>
-<md5file name="trtitle.png">74107c8827b62bfb576c7525db0c50d4</md5file>
-<md5file name="pointofsale.png">b22186030a04c7a208dd219acfe203c7</md5file>
-<md5file name="home.png">35df8b42457569b02c19be41abc87f45</md5file>
-<md5file name="generic2.png">ee172f657651ace5f45374cc6a5c3639</md5file>
-<md5file name="agenda.png">22a1d48babdead60060ea6eb841464c3</md5file>
-<md5file name="tools.png">6e4ad58de75dcbd3fe83e4680d5a94d3</md5file>
-<md5file name="toppath.gif">37e28b4e4e22b80c1d39d038599e2dff</md5file>
-<md5file name="footer_bg.jpg">dc22d6ec2bda0707404afaa8259ee219</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="moduletable_th_bg.gif">ea0cd1165069b2c5d4bd5916fe10741d</md5file>
-<md5file name="globe.png">6d28eea8d332c17dda186d63f9ae2206</md5file>
-<md5file name="commercial.png">acc3f08c46b50f9b3b66ea831aadf3ab</md5file>
-<md5file name="project.png">0ff637bde43375a809e583841634f760</md5file>
-<md5file name="topmenu_bg.png">e09179e576a7f1706c632d9c6a4be337</md5file>
-<md5file name="ecm.png">83063c2136d912f6cf89a173cf71e7d8</md5file>
-</dir>
-<dir name="/theme/auguria/img" >
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="tmenu.jpg">ae2b207691d431eccbcc781baa57ab4e</md5file>
-<md5file name="rightarrow.png">53752275e001831a1aa1af926cbdfcbd</md5file>
-<md5file name="tmenu_inverse.jpg">28d998536cc67795eb0812a1e4c5a6ed</md5file>
-<md5file name="working2.gif">767c14923c466cadc2b4d21941ea8f59</md5file>
-<md5file name="unlock.png">0ce654c1f24e1190c6c3022435e09ea7</md5file>
-<md5file name="object_email.png">89697cec3795e0df248044ce53e74756</md5file>
-<md5file name="edit.png">370330c7627ec45797aafa9e99f84762</md5file>
-<md5file name="object_group.png">92bcad6a72829412e19818ac23d99c7d</md5file>
-<md5file name="split.png">bfd0bf42e6473229d91e07d0b3f9baf7</md5file>
-<md5file name="statut0.png">dc1b29caf1ea591b1b835b96d3869db3</md5file>
-<md5file name="object_technic.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="headbg.jpg">d3dffe4a4ad4030e443985fa8ae1a91b</md5file>
-<md5file name="statut3.png">92e62681dc53e8a32accba6846001552</md5file>
-<md5file name="object_bill.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="on.png">8816de8b6e1f9e510d6b37002b1981aa</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="tmenu2.jpg">b48838edc93500f2bc9d4fe8afe1d6be</md5file>
-<md5file name="tmenu3.jpg">034863b5c8459093e35c529af988e293</md5file>
-<md5file name="object_contact_all.png">b2f4d01512267ce06fff267cf4136d6c</md5file>
-<md5file name="help.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="object_phoning.png">c5e70aa4ca496434dce0517017aa787e</md5file>
-<md5file name="object_dir.png">ad13b311bf3894d1537bf68d32120589</md5file>
-<md5file name="object_generic.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">85d404bac8dce61b4c6aaa8023b3a56d</md5file>
-<md5file name="headbg2.jpg">0bc1e68b3aef15b66b82bc1f4fec9a02</md5file>
-<md5file name="helpdoc.png">1b474f0760ef6d41e1ab690197d6c3b4</md5file>
-<md5file name="object_list.png">81707b9c0d2bcc9c4494fe861b4fb962</md5file>
-<md5file name="object_service.png">2f8d8c187982fc14d5563c7bdbc43e37</md5file>
-<md5file name="object_contract.png">d9e0bc0764b65a6d2a0515c80c52314c</md5file>
-<md5file name="stcomm-1.png">b5d06e9bd03f50a951e4c5ed8d67a9b0</md5file>
-<md5file name="object_user.png">619c0c5385acb19c1fc066b3ca4ea883</md5file>
-<md5file name="title.gif">c4df95964fa512230fe0133cb6d83d2e</md5file>
-<md5file name="object_billr.png">bf7304dd5d19225b698af27eff949294</md5file>
-<md5file name="mainlevel.gif">7cce79ebd74e8f71ce17f811dee41f34</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">7178d620bb970d5b1c9b337ec3fd4ee7</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">d345a084df9b7c46897877130a475f22</md5file>
-<md5file name="sort_asc_disabled.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="button_edit.png">19e9a1da7c2e79b9b4d18cb4224bf018</md5file>
-<md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
-<md5file name="vcard.png">fde64db4462dcd2dd78d40ac1e490286</md5file>
-<md5file name="1leftarrow_selected.png">268b73ea43444081e3d46c8754bcf74b</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="object_address.png">47efc87b5dd14b2464b2403e038d03f9</md5file>
-<md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
-<md5file name="object_category.png">665abcd595667e221eb5bf99589f8a05</md5file>
-<md5file name="1downarrow.png">dff0c705648f53cc2f2a186ca22546e8</md5file>
-<md5file name="uparrow.png">c5a1b32584b43642dcd623f195e146ca</md5file>
-<md5file name="previous.png">d2e1f32fdfd8eed8580f1b72973330d9</md5file>
-<md5file name="edit_add.png">8a7351ef099da26bbaa63ade1ada8be9</md5file>
-<md5file name="statut1.png">679c3a5f9bbbdd055430363726db4664</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">05681d69a9d1601e222762698c9e95d7</md5file>
-<md5file name="object_category-expanded.png">5a8af818e8fb9bedeb55d5cf3427e2ce</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">9c419b4fa2cd1c7ad6772cbb28934b51</md5file>
-<md5file name="object_trip.png">47b54d44fec79b69f1cc151a1b2a9a43</md5file>
-<md5file name="1downarrow_selected.png">c6c06e5a431452048d30850fdb6f1baa</md5file>
-<md5file name="pdf3.png">946e88d5612bd35d2f9297a1419ba62c</md5file>
-<md5file name="filter.png">5e83bbea91f6deaa37b247ac013ef556</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">207b36b38595eabc40f7fb975b9720b3</md5file>
-<md5file name="reload.png">6f1285c463f6d6fe42e39f34d733cf2c</md5file>
-<md5file name="folder-open.png">aba33e5e98071280db0d34c42349f1bf</md5file>
-<md5file name="addfile.png">90eb802715ce63e5e3ca4a55a42b8397</md5file>
-<md5file name="grip_title.png">810dab21a178dd4bd8acbf6c0741d2cd</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="searchclear.png">826b0a139421500b614b3302c87738d0</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="cron.png">33c4116fccc3ff06e1c82060d90c1aac</md5file>
-<md5file name="object_sending.png">dae6f405639ecf3eea0e3d1bf52936f4</md5file>
-<md5file name="object_company.png">2f1531eab3f5b51c4c6725608f4eb456</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="statut7.png">f2681caacd54b4b43912e489c678a3ec</md5file>
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-<md5file name="object_calendarday.png">fa5f8193240995285a30de76a124744c</md5file>
-<md5file name="bg_inside.gif">ba1629cc343a821009875fcc3d23afb0</md5file>
-<md5file name="body_bg.jpg">5d3b6699db4bdb0b80adcb87bca2cbda</md5file>
-<md5file name="title.png">2f7a8a40835764d2d62357e2ecbd1d28</md5file>
-<md5file name="call_out.png">a346bdb285fe8580f4b5b8dd5f5451ef</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">cbf00fbe06d62b8503f79d19005b84d5</md5file>
-<md5file name="stcomm1.png">c48848adc73b20b6a2e52888c8a7f9f9</md5file>
-<md5file name="1updownarrow.png">4ab5cf779b6ba8737731bd949438e279</md5file>
-<md5file name="calendar.png">f6c51890eb3d84defb470c9101e0e1fa</md5file>
-<md5file name="object_contact.png">db77b35764831af0b616bcc87ccda46d</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="printer.png">2e0eb0e3d978cfc35b462a199aeded78</md5file>
-<md5file name="disable.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="editdelete.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="object_intervention.png">a9e38adb81052e1178a2486de8a87c28</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="money.png">9e95e8dc5850c73b8ced6dd0bca3919d</md5file>
-<md5file name="object_payment.png">0474bee65715fc6918a92b668178be6c</md5file>
-<md5file name="stats.png">c5f9a0849fc60d9d903496e6752a8961</md5file>
-<md5file name="lock.png">a65c4d66168635b87ecbc720e2a50703</md5file>
-<md5file name="redstar.png">7921881e4e473d7284ea741addbe8810</md5file>
-<md5file name="object_billd.png">c64ea6bf2afef2560c8b642972b04663</md5file>
-<md5file name="object_product.png">3b719c139541347e5d868dc81867d444</md5file>
-<md5file name="statut9.png">752f4b5e92e81b70cae0ddc1be19e468</md5file>
-<md5file name="bg-bas-rubrique.png">9692f8944e4499d5f0dd89a7a7dbfc9c</md5file>
-<md5file name="search.png">8b7bc49f97c95c9d641d3b3c72ccf1cf</md5file>
-<md5file name="statut5.png">0ddff84d392b7fa485c6e47623f9885b</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">7714b390ff497c388fbdcfe8c0563790</md5file>
-<md5file name="bg-rubrique.png">c7701209d9f6520754d641090de4ae63</md5file>
-<md5file name="banner_02.jpg">ec291d015307e2d4798886aaf95677ae</md5file>
-<md5file name="object_billa.png">bf803d2d0ea860bbc5e35c4b6decc800</md5file>
-<md5file name="object_calendar.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="object_project.png">4454d66db639f71ab544b163923181fa</md5file>
-<md5file name="object_phoning_fax.png">c5e70aa4ca496434dce0517017aa787e</md5file>
-<md5file name="sort_asc.png">c0bd3c7c4e7d1c006b2301eab5ecd948</md5file>
-<md5file name="object_order.png">b72c3b6c763f26a3ffc3c2d6c0f6d49c</md5file>
-<md5file name="close.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="edit_remove.png">e1d238ddd4e573b085cc34b028b24883</md5file>
-<md5file name="indent1.png">ecad6bd4ba98051aa8d375b71b0e116e</md5file>
-<md5file name="gradient.gif">a03c8d2492d0ca2404593ec71b479eaf</md5file>
-<md5file name="object_globe.png">12bd3c14cc3b96cf90d3362573d85559</md5file>
-<md5file name="statut6.png">60805f7fdcc0a187defb87f4ecfd9bb3</md5file>
-<md5file name="object_propal.png">8f120e35f8b6608fb34e38edf9a2687c</md5file>
-<md5file name="info.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="recent.png">16f911dcd53ddf0a2c59fe6173f892f8</md5file>
-<md5file name="stcomm4.png">79a72d08df258b0ca33c240c1d7746c5</md5file>
-<md5file name="object_reduc.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="object_account.png">739a60ba606586c88e8626e558f16807</md5file>
-<md5file name="object_margin.png">c6a9a7d9cc31a6f650c60a8012a0d0d3</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">4d444d41aee1b2c9d54942654da1d042</md5file>
-<md5file name="stcomm2.png">9d3d0f55c282fc3544043027b119cf37</md5file>
-<md5file name="off.png">9ad922c1fdc252eb8e61dbfdcf32ada5</md5file>
-<md5file name="object_projecttask.png">03ffa8f7c09dcea59dd5c89f136c7da6</md5file>
-<md5file name="statut8.png">4a436addc8ecc176da90d6f8e7ca0a8a</md5file>
-<md5file name="button_bg.png">115c4806f36aeb531699b370720312c4</md5file>
-<md5file name="delete.png">55418df59f5b95c989be04f945a0002a</md5file>
-<md5file name="statut4.png">8475cd05414226f2ff20ee97df8bcf31</md5file>
-</dir>
-<dir name="/theme" >
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-</dir>
-<dir name="/theme/md_exp" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">f2668d60b62d550468381be65ed1630d</md5file>
-</dir>
-<dir name="/theme/md_exp/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/md_exp/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">8f39483d399ceae285fb7cc61109c809</md5file>
-</dir>
-<dir name="/theme/md_exp" >
-<md5file name="graph-color.php">6337a2b8215e8045c73c165d1969afae</md5file>
-</dir>
-<dir name="/theme/md_exp/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="nav-overlay.png">b97cd0ed145854fbc8b148ac0913565e</md5file>
-<md5file name="object_bookmark.png">bb1be9c660e554a43686915f1d7f021f</md5file>
-<md5file name="tick.png">445b34b4ac5dbd8cbdbb2d8d52656cab</md5file>
-<md5file name="view.png">4af4f260359b0ce9c42f77ab47caa6bb</md5file>
-<md5file name="warning.png">f1d99169e9f6f6e4880a4f2859b53858</md5file>
-<md5file name="calc.png">8bb0f71417f315eb04c44bf1b07dd157</md5file>
-<md5file name="puce.png">e7e6b8d7a9b989619beabe01cdff3bb2</md5file>
-<md5file name="filenew.png">a671cca2c79d9135464aa9f41e78b026</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">1e99a575dd2737b28288144382810210</md5file>
-<md5file name="1leftarrow.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">b3ef3d72a6836a5291a0487307b5d8f6</md5file>
-<md5file name="stcomm3.png">131e9c1492e737f2c9ec974ca6266f1a</md5file>
-<md5file name="object_book.png">bf5474e7c85243d85f6ce742204bb692</md5file>
-<md5file name="object_stock.png">7d389b04b1d62e932d0e2696c7e68e9d</md5file>
-<md5file name="object_task.png">287ac7dbd72c235345b20a09e93f4df4</md5file>
-<md5file name="history.png">2a2a087b71d3730e58954da48d65b1e0</md5file>
-<md5file name="object_energie.png">71042cbc4ea8acafe754fb436feff958</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">a665caf39101bdf12f66bdbaea3c1e74</md5file>
-<md5file name="folder.png">618d61f6e80aaea18e3257b4d6cc2728</md5file>
-<md5file name="file.png">4b31ec814f6c455fb7d72f4d32589b3c</md5file>
-<md5file name="1uparrow_selected.png">4b35eb7636936f48c6d40353135af307</md5file>
-<md5file name="1rightarrow.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="object_invoice.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">351226b86bf32c35da86bc84d37710ac</md5file>
-<md5file name="bg-titre-rubrique.png">e80502a829c7141deddf60ac87e42e46</md5file>
-<md5file name="close_title.png">fb0e617a4e54b963f7c2139efa874d10</md5file>
-<md5file name="detail.png">cd26e28d19227f52dbb7af6285f49684</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">c5e70aa4ca496434dce0517017aa787e</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">a6879b7e59ccb7926635047f0c736b05</md5file>
-<md5file name="object_calendarweek.png">4f37eab95abbe47905271558dfe2582f</md5file>
-</dir>
-<dir name="/theme/md_exp/img/menus" >
-<md5file name="holiday.png">d29432daede0438dd797ecdbdf915015</md5file>
-<md5file name="company.png">03561d6f159b40a276ae7eca3319970c</md5file>
-<md5file name="generic4.png">d8386960c63e6b27895685c70c4c435e</md5file>
-<md5file name="bank.png">f6858cdcdb32713ba80d87cd99257e51</md5file>
-<md5file name="company_over.png">8bcbac102e83193d933a2c936857635f</md5file>
-<md5file name="bank_over.png">c797a7830343e4700562dc7f4acf1f02</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="generic3_over.png">10cb1a61683843039f3f99527f0447a0</md5file>
-<md5file name="generic3.png">5eca57a0b130d1f5a4cd73d4053f44d3</md5file>
-<md5file name="agenda_over.png">40a032464455dd72235e79afa94beb15</md5file>
-<md5file name="ftp_over.png">87f5e4a61a397aeffc7d8fdd96673988</md5file>
-<md5file name="generic1.png">3afe38c6b38b07c3bdfdcfa982e9218b</md5file>
-<md5file name="ftp.png">ebc05e1e66b1eb6dc5a6bdf27e2eac01</md5file>
-<md5file name="home_over.png">b0844a2326bceb13156ab3950a60b7b3</md5file>
-<md5file name="generic1_over.png">7946f4323bc05ed1418e7b056ccbfb4e</md5file>
-<md5file name="members.png">6271882092ed28f4227be476c54535cb</md5file>
-<md5file name="products.png">c4b077a4e3f7d8c58bb112c6dbe6674f</md5file>
-<md5file name="mail.png">1ee75057ea44ea31b5d2167d8588e39d</md5file>
-<md5file name="products_over.png">c5b2fccc94d752d454472d6fe7a9aa3b</md5file>
-<md5file name="members_over.png">45e61dc0820ab58a6097c676507874c9</md5file>
-<md5file name="pointofsale.png">be8a7ee2b863d701cf8d379676d3245e</md5file>
-<md5file name="tools_over.png">5ddea6a4cd5005e849f6f307f1d40928</md5file>
-<md5file name="home.png">d956abc3ac4cac362a78ba0f2cbcbdc7</md5file>
-<md5file name="generic2.png">87f28d57fe2a6d30d4ee3975ef4a25fc</md5file>
-<md5file name="project_over.png">2c92545e15695b5d27839c7662657ab0</md5file>
-<md5file name="agenda.png">a79636bc2b90ad32bd15c9015ff17ae2</md5file>
-<md5file name="tools.png">6c83356f69563552d5d971e9f956253b</md5file>
-<md5file name="globe_over.png">d7e4cc99c44cc6add3563cb2ac5d16bc</md5file>
-<md5file name="shop_over.png">3c22e69f2f2972bac1f8df3e48f0eb52</md5file>
-<md5file name="generic4_over.png">f6412834592319407d829327cf8f23c2</md5file>
-<md5file name="pointofsale_over.png">88cb6b600eb10287e93e27079ab792ad</md5file>
-<md5file name="externalsite.png">249398348c5370aa367828a1261e823b</md5file>
-<md5file name="mail_over.png">7cf564871684986dfe050a9acefab1f0</md5file>
-<md5file name="money.png">75744ffb286ebd32ec6b56a8cb86a2e1</md5file>
-<md5file name="ecm_over.png">038daf9b3dd4ba6f83911814a80b643d</md5file>
-<md5file name="money_over.png">c85f0bebb04ba27eb017570ee8e36251</md5file>
-<md5file name="generic2_over.png">db6df0c5e4d7490f31a4e9ecb6e4e958</md5file>
-<md5file name="chart.png">5c528b3369644c9cfd8bab9a46de2eb9</md5file>
-<md5file name="externalsite_over.png">efaeb3402e4a2da275228cd5416e735c</md5file>
-<md5file name="globe.png">4b0b0ba3958672efa8a88a275a5615ee</md5file>
-<md5file name="commercial_over.png">4f1c6183c66d473cfa9a2e027f53908d</md5file>
-<md5file name="shop.png">dbba0203d75b6632646e0d8ce4d94fe7</md5file>
-<md5file name="commercial.png">e296916aaeb42ec20dc1768f076ff326</md5file>
-<md5file name="project.png">bfa34f4c07c482fe4e7ec8f2c13e8d08</md5file>
-<md5file name="ecm.png">1a940cd57dff03f0f9f8ac3513e816d1</md5file>
-</dir>
-<dir name="/theme/md_exp/img" >
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="tmenu.jpg">105926bd2146d9d2f96c2f5650591a1a</md5file>
-<md5file name="rightarrow.png">53752275e001831a1aa1af926cbdfcbd</md5file>
-<md5file name="object_calendarperuser.png">6d76981b87d6b8f482aa5b3950f172bb</md5file>
-<md5file name="tmenu_inverse.jpg">28d998536cc67795eb0812a1e4c5a6ed</md5file>
-<md5file name="working2.gif">767c14923c466cadc2b4d21941ea8f59</md5file>
-<md5file name="unlock.png">0ce654c1f24e1190c6c3022435e09ea7</md5file>
-<md5file name="object_email.png">89697cec3795e0df248044ce53e74756</md5file>
-<md5file name="edit.png">370330c7627ec45797aafa9e99f84762</md5file>
-<md5file name="object_group.png">92bcad6a72829412e19818ac23d99c7d</md5file>
-<md5file name="split.png">bfd0bf42e6473229d91e07d0b3f9baf7</md5file>
-<md5file name="statut0.png">dc1b29caf1ea591b1b835b96d3869db3</md5file>
-<md5file name="object_technic.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="headbg.jpg">d3dffe4a4ad4030e443985fa8ae1a91b</md5file>
-<md5file name="statut3.png">92e62681dc53e8a32accba6846001552</md5file>
-<md5file name="object_bill.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="on.png">8816de8b6e1f9e510d6b37002b1981aa</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="tmenu2.jpg">80bcf9c563ad0391642045dbff06d419</md5file>
-<md5file name="tmenu3.jpg">034863b5c8459093e35c529af988e293</md5file>
-<md5file name="object_contact_all.png">b2f4d01512267ce06fff267cf4136d6c</md5file>
-<md5file name="help.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="object_phoning.png">556e7abe13d8106bdda27be2fa1b6613</md5file>
-<md5file name="object_dir.png">ad13b311bf3894d1537bf68d32120589</md5file>
-<md5file name="object_generic.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">85d404bac8dce61b4c6aaa8023b3a56d</md5file>
-<md5file name="headbg2.jpg">0bc1e68b3aef15b66b82bc1f4fec9a02</md5file>
-<md5file name="helpdoc.png">1b474f0760ef6d41e1ab690197d6c3b4</md5file>
-<md5file name="object_list.png">81707b9c0d2bcc9c4494fe861b4fb962</md5file>
-<md5file name="object_service.png">2f8d8c187982fc14d5563c7bdbc43e37</md5file>
-<md5file name="object_contract.png">d9e0bc0764b65a6d2a0515c80c52314c</md5file>
-<md5file name="stcomm-1.png">3f75ac05a676ab5c90483bcea3b7a6e1</md5file>
-<md5file name="object_user.png">619c0c5385acb19c1fc066b3ca4ea883</md5file>
-<md5file name="title.gif">c4df95964fa512230fe0133cb6d83d2e</md5file>
-<md5file name="object_billr.png">bf7304dd5d19225b698af27eff949294</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">3a186df0e76f4b69fa549fe809aa77c2</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">d345a084df9b7c46897877130a475f22</md5file>
-<md5file name="liste_titre2.png">c376d9324174a12063c9177dba2a456b</md5file>
-<md5file name="sort_asc_disabled.png">45d9d3a78fbe7e58ac5728e9ccca9717</md5file>
-<md5file name="button_edit.png">19e9a1da7c2e79b9b4d18cb4224bf018</md5file>
-<md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
-<md5file name="liste_titre.png">f6d558ae332bd91dea66be7e702e7ed5</md5file>
-<md5file name="vcard.png">fde64db4462dcd2dd78d40ac1e490286</md5file>
-<md5file name="1leftarrow_selected.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="object_address.png">8038e4775316d36b154b2d20f8eca0ae</md5file>
-<md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
-<md5file name="object_category.png">665abcd595667e221eb5bf99589f8a05</md5file>
-<md5file name="1downarrow.png">c2664fbfabe5322a1a136ef9e6ec28db</md5file>
-<md5file name="nav-overlay3.png">41d59efa00cc27e8df1b147decc0ee2a</md5file>
-<md5file name="uparrow.png">c5a1b32584b43642dcd623f195e146ca</md5file>
-<md5file name="previous.png">d2e1f32fdfd8eed8580f1b72973330d9</md5file>
-<md5file name="edit_add.png">8a7351ef099da26bbaa63ade1ada8be9</md5file>
-<md5file name="statut1.png">679c3a5f9bbbdd055430363726db4664</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">05681d69a9d1601e222762698c9e95d7</md5file>
-<md5file name="object_category-expanded.png">5a8af818e8fb9bedeb55d5cf3427e2ce</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="object_trip.png">47b54d44fec79b69f1cc151a1b2a9a43</md5file>
-<md5file name="1downarrow_selected.png">f933a0d4e4f4a2f465d48977a62f71b0</md5file>
-<md5file name="pdf3.png">946e88d5612bd35d2f9297a1419ba62c</md5file>
-<md5file name="filter.png">5e83bbea91f6deaa37b247ac013ef556</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">b57af4b9947810d411c878d3e9caa276</md5file>
-<md5file name="reload.png">6f1285c463f6d6fe42e39f34d733cf2c</md5file>
-<md5file name="folder-open.png">aba33e5e98071280db0d34c42349f1bf</md5file>
-<md5file name="addfile.png">90eb802715ce63e5e3ca4a55a42b8397</md5file>
-<md5file name="grip_title.png">810dab21a178dd4bd8acbf6c0741d2cd</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="searchclear.png">826b0a139421500b614b3302c87738d0</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="object_sending.png">dae6f405639ecf3eea0e3d1bf52936f4</md5file>
-<md5file name="object_company.png">2f1531eab3f5b51c4c6725608f4eb456</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="statut7.png">f2681caacd54b4b43912e489c678a3ec</md5file>
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-<md5file name="object_calendarday.png">fa5f8193240995285a30de76a124744c</md5file>
-<md5file name="title.png">2f7a8a40835764d2d62357e2ecbd1d28</md5file>
-<md5file name="call_out.png">a346bdb285fe8580f4b5b8dd5f5451ef</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">cbf00fbe06d62b8503f79d19005b84d5</md5file>
-<md5file name="stcomm1.png">c48848adc73b20b6a2e52888c8a7f9f9</md5file>
-<md5file name="1updownarrow.png">4ab5cf779b6ba8737731bd949438e279</md5file>
-<md5file name="calendar.png">f6c51890eb3d84defb470c9101e0e1fa</md5file>
-<md5file name="object_contact.png">db77b35764831af0b616bcc87ccda46d</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="printer.png">2e0eb0e3d978cfc35b462a199aeded78</md5file>
-<md5file name="disable.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="editdelete.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="object_askpricesupplier.png">8f120e35f8b6608fb34e38edf9a2687c</md5file>
-<md5file name="object_intervention.png">a9e38adb81052e1178a2486de8a87c28</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="object_payment.png">0474bee65715fc6918a92b668178be6c</md5file>
-<md5file name="stats.png">c5f9a0849fc60d9d903496e6752a8961</md5file>
-<md5file name="lock.png">a65c4d66168635b87ecbc720e2a50703</md5file>
-<md5file name="redstar.png">7921881e4e473d7284ea741addbe8810</md5file>
-<md5file name="object_billd.png">c64ea6bf2afef2560c8b642972b04663</md5file>
-<md5file name="object_product.png">3b719c139541347e5d868dc81867d444</md5file>
-<md5file name="statut9.png">752f4b5e92e81b70cae0ddc1be19e468</md5file>
-<md5file name="bg-bas-rubrique.png">4ee61217dbfae0266feb5345aab311cf</md5file>
-<md5file name="object_task_time.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="search.png">8b7bc49f97c95c9d641d3b3c72ccf1cf</md5file>
-<md5file name="statut5.png">0ddff84d392b7fa485c6e47623f9885b</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">74ec0398a7ef045c66ac8a7a60f93fb0</md5file>
-<md5file name="bg-rubrique.png">a174947c846b0105d6556d7497e5d2ab</md5file>
-<md5file name="object_billa.png">bf803d2d0ea860bbc5e35c4b6decc800</md5file>
-<md5file name="object_calendar.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="object_project.png">4454d66db639f71ab544b163923181fa</md5file>
-<md5file name="object_phoning_fax.png">7fd720194f42e7c1ae62927d6adfc046</md5file>
-<md5file name="sort_asc.png">7fb6e9956e37e06daaf1510132bceb78</md5file>
-<md5file name="object_order.png">b72c3b6c763f26a3ffc3c2d6c0f6d49c</md5file>
-<md5file name="close.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="edit_remove.png">e1d238ddd4e573b085cc34b028b24883</md5file>
-<md5file name="gradient.gif">a03c8d2492d0ca2404593ec71b479eaf</md5file>
-<md5file name="object_globe.png">12bd3c14cc3b96cf90d3362573d85559</md5file>
-<md5file name="menutab-r.png">e8673277dd7383120e5f9028d0caccb6</md5file>
-<md5file name="statut6.png">60805f7fdcc0a187defb87f4ecfd9bb3</md5file>
-<md5file name="object_propal.png">8f120e35f8b6608fb34e38edf9a2687c</md5file>
-<md5file name="background.png">bdca821b84171d36d4ad692ad9c11742</md5file>
-<md5file name="info.png">cd4aafbf96f9ca00ec1ea45ce445273f</md5file>
-<md5file name="recent.png">16f911dcd53ddf0a2c59fe6173f892f8</md5file>
-<md5file name="stcomm4.png">79a72d08df258b0ca33c240c1d7746c5</md5file>
-<md5file name="object_reduc.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="object_account.png">739a60ba606586c88e8626e558f16807</md5file>
-<md5file name="object_margin.png">c6a9a7d9cc31a6f650c60a8012a0d0d3</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">4d444d41aee1b2c9d54942654da1d042</md5file>
-<md5file name="stcomm2.png">9d3d0f55c282fc3544043027b119cf37</md5file>
-<md5file name="off.png">9ad922c1fdc252eb8e61dbfdcf32ada5</md5file>
-<md5file name="object_projecttask.png">03ffa8f7c09dcea59dd5c89f136c7da6</md5file>
-<md5file name="statut8.png">4a436addc8ecc176da90d6f8e7ca0a8a</md5file>
-<md5file name="button_bg.png">115c4806f36aeb531699b370720312c4</md5file>
-<md5file name="delete.png">55418df59f5b95c989be04f945a0002a</md5file>
-<md5file name="statut4.png">8475cd05414226f2ff20ee97df8bcf31</md5file>
-</dir>
-<dir name="/theme/eldy" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="style.css.php">454717ceabbc959f7902beb3903f011e</md5file>
-</dir>
-<dir name="/theme/eldy/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/theme/eldy/ckeditor" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="config.js">8f39483d399ceae285fb7cc61109c809</md5file>
-</dir>
-<dir name="/theme/eldy" >
-<md5file name="graph-color.php">d3e751a8e183a3dd285daaad51383ddf</md5file>
-<md5file name="thumb.png">64ddd81ea2b2522ab666edb41a4e5863</md5file>
-</dir>
-<dir name="/theme/eldy/img" >
-<md5file name="title_generic.png">26a3978f1a1cf63348e4ef363c263131</md5file>
-<md5file name="nav-overlay.png">b97cd0ed145854fbc8b148ac0913565e</md5file>
-<md5file name="object_bookmark.png">bb1be9c660e554a43686915f1d7f021f</md5file>
-<md5file name="tick.png">445b34b4ac5dbd8cbdbb2d8d52656cab</md5file>
-<md5file name="view.png">4af4f260359b0ce9c42f77ab47caa6bb</md5file>
-<md5file name="warning.png">f1d99169e9f6f6e4880a4f2859b53858</md5file>
-<md5file name="calc.png">8bb0f71417f315eb04c44bf1b07dd157</md5file>
-<md5file name="puce.png">e7e6b8d7a9b989619beabe01cdff3bb2</md5file>
-<md5file name="filenew.png">a671cca2c79d9135464aa9f41e78b026</md5file>
-<md5file name="tab_background.png">adbd23ce0f80d78b794b1bf265c21e5e</md5file>
-<md5file name="object_resource.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="refresh.png">1e99a575dd2737b28288144382810210</md5file>
-<md5file name="1leftarrow.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="object_holiday.png">c6e27842c8603e8d0679cdcef7cb6504</md5file>
-<md5file name="next.png">b3ef3d72a6836a5291a0487307b5d8f6</md5file>
-<md5file name="stcomm3.png">131e9c1492e737f2c9ec974ca6266f1a</md5file>
-<md5file name="object_book.png">bf5474e7c85243d85f6ce742204bb692</md5file>
-<md5file name="object_stock.png">7d389b04b1d62e932d0e2696c7e68e9d</md5file>
-<md5file name="object_task.png">287ac7dbd72c235345b20a09e93f4df4</md5file>
-<md5file name="history.png">2a2a087b71d3730e58954da48d65b1e0</md5file>
-<md5file name="object_energie.png">71042cbc4ea8acafe754fb436feff958</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="object_action.png">a665caf39101bdf12f66bdbaea3c1e74</md5file>
-<md5file name="folder.png">618d61f6e80aaea18e3257b4d6cc2728</md5file>
-<md5file name="file.png">4b31ec814f6c455fb7d72f4d32589b3c</md5file>
-<md5file name="1uparrow_selected.png">4b35eb7636936f48c6d40353135af307</md5file>
-<md5file name="1rightarrow.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="object_invoice.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="object_gravatar.png">60152344388314374238c9e8cb697099</md5file>
-<md5file name="object_opensurvey.png">8707c43fc89f7fefe22678f3a25fd20c</md5file>
-<md5file name="call.png">351226b86bf32c35da86bc84d37710ac</md5file>
-<md5file name="bg-titre-rubrique.png">e80502a829c7141deddf60ac87e42e46</md5file>
-<md5file name="close_title.png">fb0e617a4e54b963f7c2139efa874d10</md5file>
-<md5file name="detail.png">cd26e28d19227f52dbb7af6285f49684</md5file>
-<md5file name="title_commercial.png">19d37ea793e07343775fa6f8e3cb5671</md5file>
-<md5file name="object_commercial.png">c5e70aa4ca496434dce0517017aa787e</md5file>
-<md5file name="title_companies.png">d01041e2b86955d1e1021ea0c5e12133</md5file>
-<md5file name="object_action_rdv.png">1c1dfcfd97b07cefb27d60e989f82427</md5file>
-<md5file name="pdf2.png">a6879b7e59ccb7926635047f0c736b05</md5file>
-<md5file name="object_calendarweek.png">4f37eab95abbe47905271558dfe2582f</md5file>
-</dir>
-<dir name="/theme/eldy/img/menus" >
-<md5file name="holiday.png">d29432daede0438dd797ecdbdf915015</md5file>
-<md5file name="company.png">03561d6f159b40a276ae7eca3319970c</md5file>
-<md5file name="generic4.png">d8386960c63e6b27895685c70c4c435e</md5file>
-<md5file name="bank.png">f6858cdcdb32713ba80d87cd99257e51</md5file>
-<md5file name="company_over.png">8bcbac102e83193d933a2c936857635f</md5file>
-<md5file name="bank_over.png">c797a7830343e4700562dc7f4acf1f02</md5file>
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="generic3_over.png">10cb1a61683843039f3f99527f0447a0</md5file>
-<md5file name="generic3.png">5eca57a0b130d1f5a4cd73d4053f44d3</md5file>
-<md5file name="agenda_over.png">40a032464455dd72235e79afa94beb15</md5file>
-<md5file name="ftp_over.png">87f5e4a61a397aeffc7d8fdd96673988</md5file>
-<md5file name="generic1.png">3afe38c6b38b07c3bdfdcfa982e9218b</md5file>
-<md5file name="ftp.png">ebc05e1e66b1eb6dc5a6bdf27e2eac01</md5file>
-<md5file name="home_over.png">b0844a2326bceb13156ab3950a60b7b3</md5file>
-<md5file name="generic1_over.png">7946f4323bc05ed1418e7b056ccbfb4e</md5file>
-<md5file name="members.png">6271882092ed28f4227be476c54535cb</md5file>
-<md5file name="products.png">c4b077a4e3f7d8c58bb112c6dbe6674f</md5file>
-<md5file name="mail.png">1ee75057ea44ea31b5d2167d8588e39d</md5file>
-<md5file name="products_over.png">c5b2fccc94d752d454472d6fe7a9aa3b</md5file>
-<md5file name="members_over.png">45e61dc0820ab58a6097c676507874c9</md5file>
-<md5file name="pointofsale.png">be8a7ee2b863d701cf8d379676d3245e</md5file>
-<md5file name="tools_over.png">5ddea6a4cd5005e849f6f307f1d40928</md5file>
-<md5file name="home.png">d956abc3ac4cac362a78ba0f2cbcbdc7</md5file>
-<md5file name="generic2.png">87f28d57fe2a6d30d4ee3975ef4a25fc</md5file>
-<md5file name="project_over.png">2c92545e15695b5d27839c7662657ab0</md5file>
-<md5file name="agenda.png">a79636bc2b90ad32bd15c9015ff17ae2</md5file>
-<md5file name="tools.png">6c83356f69563552d5d971e9f956253b</md5file>
-<md5file name="globe_over.png">d7e4cc99c44cc6add3563cb2ac5d16bc</md5file>
-<md5file name="shop_over.png">3c22e69f2f2972bac1f8df3e48f0eb52</md5file>
-<md5file name="generic4_over.png">f6412834592319407d829327cf8f23c2</md5file>
-<md5file name="pointofsale_over.png">88cb6b600eb10287e93e27079ab792ad</md5file>
-<md5file name="externalsite.png">249398348c5370aa367828a1261e823b</md5file>
-<md5file name="mail_over.png">7cf564871684986dfe050a9acefab1f0</md5file>
-<md5file name="money.png">75744ffb286ebd32ec6b56a8cb86a2e1</md5file>
-<md5file name="ecm_over.png">038daf9b3dd4ba6f83911814a80b643d</md5file>
-<md5file name="money_over.png">c85f0bebb04ba27eb017570ee8e36251</md5file>
-<md5file name="generic2_over.png">db6df0c5e4d7490f31a4e9ecb6e4e958</md5file>
-<md5file name="chart.png">5c528b3369644c9cfd8bab9a46de2eb9</md5file>
-<md5file name="externalsite_over.png">efaeb3402e4a2da275228cd5416e735c</md5file>
-<md5file name="globe.png">4b0b0ba3958672efa8a88a275a5615ee</md5file>
-<md5file name="commercial_over.png">4f1c6183c66d473cfa9a2e027f53908d</md5file>
-<md5file name="shop.png">dbba0203d75b6632646e0d8ce4d94fe7</md5file>
-<md5file name="commercial.png">e296916aaeb42ec20dc1768f076ff326</md5file>
-<md5file name="project.png">bfa34f4c07c482fe4e7ec8f2c13e8d08</md5file>
-<md5file name="ecm.png">1a940cd57dff03f0f9f8ac3513e816d1</md5file>
-</dir>
-<dir name="/theme/eldy/img" >
-<md5file name="title_setup.png">f5a4c8ccc8fc2f1dc246ec2f70c7dc91</md5file>
-<md5file name="tmenu.jpg">105926bd2146d9d2f96c2f5650591a1a</md5file>
-<md5file name="rightarrow.png">53752275e001831a1aa1af926cbdfcbd</md5file>
-<md5file name="object_calendarperuser.png">6d76981b87d6b8f482aa5b3950f172bb</md5file>
-<md5file name="tmenu_inverse.jpg">28d998536cc67795eb0812a1e4c5a6ed</md5file>
-<md5file name="working2.gif">767c14923c466cadc2b4d21941ea8f59</md5file>
-<md5file name="unlock.png">0ce654c1f24e1190c6c3022435e09ea7</md5file>
-<md5file name="object_email.png">89697cec3795e0df248044ce53e74756</md5file>
-<md5file name="edit.png">370330c7627ec45797aafa9e99f84762</md5file>
-<md5file name="object_group.png">92bcad6a72829412e19818ac23d99c7d</md5file>
-<md5file name="split.png">bfd0bf42e6473229d91e07d0b3f9baf7</md5file>
-<md5file name="statut0.png">dc1b29caf1ea591b1b835b96d3869db3</md5file>
-<md5file name="object_technic.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="headbg.jpg">d3dffe4a4ad4030e443985fa8ae1a91b</md5file>
-<md5file name="statut3.png">92e62681dc53e8a32accba6846001552</md5file>
-<md5file name="object_bill.png">4b1644100e7aea8a79bf8404381b8654</md5file>
-<md5file name="on.png">8816de8b6e1f9e510d6b37002b1981aa</md5file>
-<md5file name="working.gif">3de564ee11be8e8c77599abd1e3f3b40</md5file>
-<md5file name="tmenu2.jpg">80bcf9c563ad0391642045dbff06d419</md5file>
-<md5file name="tmenu3.jpg">034863b5c8459093e35c529af988e293</md5file>
-<md5file name="object_contact_all.png">b2f4d01512267ce06fff267cf4136d6c</md5file>
-<md5file name="help.png">55260794af084e7fac206c20621e8fca</md5file>
-<md5file name="object_phoning.png">556e7abe13d8106bdda27be2fa1b6613</md5file>
-<md5file name="object_dir.png">ad13b311bf3894d1537bf68d32120589</md5file>
-<md5file name="object_generic.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="title_accountancy.png">5cbe621c76cbc515a28991705e268dbe</md5file>
-<md5file name="object_label.png">85d404bac8dce61b4c6aaa8023b3a56d</md5file>
-<md5file name="headbg2.jpg">0bc1e68b3aef15b66b82bc1f4fec9a02</md5file>
-<md5file name="helpdoc.png">1b474f0760ef6d41e1ab690197d6c3b4</md5file>
-<md5file name="object_list.png">81707b9c0d2bcc9c4494fe861b4fb962</md5file>
-<md5file name="object_service.png">2f8d8c187982fc14d5563c7bdbc43e37</md5file>
-<md5file name="object_contract.png">d9e0bc0764b65a6d2a0515c80c52314c</md5file>
-<md5file name="stcomm-1.png">b5d06e9bd03f50a951e4c5ed8d67a9b0</md5file>
-<md5file name="object_user.png">619c0c5385acb19c1fc066b3ca4ea883</md5file>
-<md5file name="title.gif">c4df95964fa512230fe0133cb6d83d2e</md5file>
-<md5file name="object_billr.png">bf7304dd5d19225b698af27eff949294</md5file>
-<md5file name="title_project.png">a043ad2f203a743b407deec8d036eca5</md5file>
-<md5file name="setup.png">3a186df0e76f4b69fa549fe809aa77c2</md5file>
-<md5file name="play.png">e605e982c1935f82b08f81c61fa61b3c</md5file>
-<md5file name="object_rss.png">d345a084df9b7c46897877130a475f22</md5file>
-<md5file name="liste_titre2.png">c376d9324174a12063c9177dba2a456b</md5file>
-<md5file name="sort_asc_disabled.png">45d9d3a78fbe7e58ac5728e9ccca9717</md5file>
-<md5file name="button_edit.png">19e9a1da7c2e79b9b4d18cb4224bf018</md5file>
-<md5file name="star.png">6151a7c4134040854886bc5006a0f7c9</md5file>
-<md5file name="liste_titre.png">f6d558ae332bd91dea66be7e702e7ed5</md5file>
-<md5file name="vcard.png">fde64db4462dcd2dd78d40ac1e490286</md5file>
-<md5file name="1leftarrow_selected.png">e5f6f03a4edf8b78cb561640dd021ef9</md5file>
-<md5file name="grip.png">6ca183f901d31980b285e187778a82c1</md5file>
-<md5file name="object_printer.png">e7e7279bf3b7845d60813383267bfa37</md5file>
-<md5file name="title_hrm.png">a5e086a23801dcfce3db1c2771a93a95</md5file>
-<md5file name="object_address.png">8038e4775316d36b154b2d20f8eca0ae</md5file>
-<md5file name="high.png">f2930d262bbe944d1a7850e4a18a2e50</md5file>
-<md5file name="object_category.png">665abcd595667e221eb5bf99589f8a05</md5file>
-<md5file name="1downarrow.png">c2664fbfabe5322a1a136ef9e6ec28db</md5file>
-</dir>
-<dir name="/theme/eldy/img/menus_black" >
-<md5file name="holiday.png">a5e086a23801dcfce3db1c2771a93a95</md5file>
-<md5file name="company.png">7d10d6dbc1f9f2c0c829547ae9dac5ce</md5file>
-<md5file name="generic4.png">ee824cf6776480f19eafb0e66bc37fab</md5file>
-<md5file name="bank.png">64c990e913582ce96567f2a33b77e5cc</md5file>
-<md5file name="company_over.png">1b1dbebd7debbfa2fdcb976a6eb8d2a5</md5file>
-<md5file name="bank_over.png">70da629ba3d8a2f001293f990b853d84</md5file>
-<md5file name="generic3_over.png">54636246f05a475b133a1b451c03e8bc</md5file>
-<md5file name="generic3.png">857fd4a720646781c073435f64e422f5</md5file>
-<md5file name="agenda_over.png">eed99043ffbc1636f470c638184e74f8</md5file>
-<md5file name="ftp_over.png">dfc73e8ef77f55c693779c678fc0dbb2</md5file>
-<md5file name="generic1.png">3bf963896c4b2cd3e69ef4b7a2dd6466</md5file>
-<md5file name="ftp.png">3f991827a9e917caf795807aec7aca77</md5file>
-<md5file name="home_over.png">b6c301be8fdbbc7c54b90069d3832a05</md5file>
-<md5file name="generic1_over.png">6e053d5694b92090c4dabe2dccebbc55</md5file>
-<md5file name="members.png">f77b85727494a7777fb528d4e74a2908</md5file>
-<md5file name="products.png">e65844b0da53461e20fc7a27cc998de8</md5file>
-<md5file name="mail.png">3d447751616d189feb8f4abe225e8806</md5file>
-<md5file name="products_over.png">b72b3f4c13324104a40db6c02693f6d1</md5file>
-<md5file name="members_over.png">104b3da52c824c4d21fb90aee5445089</md5file>
-<md5file name="pointofsale.png">e7752e2bfe7b417bbf48bb3c9b1932ab</md5file>
-<md5file name="tools_over.png">6cbf986df4190b98cfe6007cfbed6295</md5file>
-<md5file name="home.png">f8aa78afcaba3497b9f42a82a75d46b6</md5file>
-<md5file name="generic2.png">940c5e08ee603fe4de989a53b0a3b305</md5file>
-<md5file name="project_over.png">049560e8c8792190975b0bb73e88d1a6</md5file>
-<md5file name="agenda.png">9325113570b629298444a50f1e188d08</md5file>
-<md5file name="tools.png">36977f1b691da5a7c1ffa27000ccab64</md5file>
-<md5file name="globe_over.png">076b0683bd9709a424503f44e8114174</md5file>
-<md5file name="shop_over.png">1e41211e961cdb9546abcb144ab50c05</md5file>
-<md5file name="generic4_over.png">9fa3121592d69fd677ad305d3f4da0ae</md5file>
-<md5file name="pointofsale_over.png">5e12871ea910a6acc073e9c5dfda3bd9</md5file>
-<md5file name="externalsite.png">d9567f70e2b5de39cea3f8ae90b73595</md5file>
-<md5file name="mail_over.png">d407f26b3740a52df5e8c619ad06311b</md5file>
-<md5file name="money.png">0cbe025fb20b6db195bb6ccb64930de3</md5file>
-<md5file name="ecm_over.png">fe142b8fbc1f170c0f2423dc86cdcb0f</md5file>
-<md5file name="money_over.png">a5dec0e545fbe51ccd8ee88a04b765ad</md5file>
-<md5file name="generic2_over.png">f42f66c04cc8694fc96c6429f01e92ce</md5file>
-<md5file name="externalsite_over.png">cb68b41ee9ba56e19b1fcd031dc392cb</md5file>
-<md5file name="globe.png">946f91cec0c8f171bb8f5825a800bedc</md5file>
-<md5file name="commercial_over.png">af5bd4a063b464bc5f02f40eae30d3bc</md5file>
-<md5file name="shop.png">0d2f6939e820e7e2a8110ebcf41215b0</md5file>
-<md5file name="commercial.png">5883ede99edc85cf16b80a9c0cf0feb4</md5file>
-<md5file name="project.png">dc0411d15f7bd6897ccffaa8c6de7283</md5file>
-<md5file name="ecm.png">965eee4c7e1404c517b2447649743d0b</md5file>
-</dir>
-<dir name="/theme/eldy/img" >
-<md5file name="nav-overlay3.png">41d59efa00cc27e8df1b147decc0ee2a</md5file>
-<md5file name="uparrow.png">c5a1b32584b43642dcd623f195e146ca</md5file>
-<md5file name="previous.png">d2e1f32fdfd8eed8580f1b72973330d9</md5file>
-<md5file name="edit_add.png">8a7351ef099da26bbaa63ade1ada8be9</md5file>
-<md5file name="statut1.png">679c3a5f9bbbdd055430363726db4664</md5file>
-<md5file name="title_home.png">c088d67b3cd6fd4815180b3f98ca8f5c</md5file>
-<md5file name="object_barcode.png">05681d69a9d1601e222762698c9e95d7</md5file>
-<md5file name="object_category-expanded.png">5a8af818e8fb9bedeb55d5cf3427e2ce</md5file>
-<md5file name="object_accounting.png">8376d641f582ea7fbf4334fe8ee54403</md5file>
-<md5file name="1rightarrow_selected.png">7c7da4fdb0743389e825481f72db8fbf</md5file>
-<md5file name="info_black.png">74ff19c57e96a71849acb49844f60920</md5file>
-<md5file name="object_trip.png">47b54d44fec79b69f1cc151a1b2a9a43</md5file>
-<md5file name="1downarrow_selected.png">f933a0d4e4f4a2f465d48977a62f71b0</md5file>
-<md5file name="pdf3.png">946e88d5612bd35d2f9297a1419ba62c</md5file>
-<md5file name="filter.png">5e83bbea91f6deaa37b247ac013ef556</md5file>
-<md5file name="title_bank.png">2481e1d39c2007f602fab6488777eaa6</md5file>
-<md5file name="1uparrow.png">b57af4b9947810d411c878d3e9caa276</md5file>
-<md5file name="reload.png">6f1285c463f6d6fe42e39f34d733cf2c</md5file>
-<md5file name="folder-open.png">aba33e5e98071280db0d34c42349f1bf</md5file>
-<md5file name="addfile.png">90eb802715ce63e5e3ca4a55a42b8397</md5file>
-<md5file name="grip_title.png">810dab21a178dd4bd8acbf6c0741d2cd</md5file>
-<md5file name="title_products.png">efe33061592589b22ca62d7d972a9218</md5file>
-<md5file name="searchclear.png">ee8242ba8e82c90a0703e1ef60e92b56</md5file>
-<md5file name="error.png">136042c53e8cdcd5c877a55278b800a8</md5file>
-<md5file name="object_sending.png">dae6f405639ecf3eea0e3d1bf52936f4</md5file>
-<md5file name="object_company.png">2f1531eab3f5b51c4c6725608f4eb456</md5file>
-<md5file name="sort_desc_disabled.png">3d64316fad587349e5d9dd0792249162</md5file>
-<md5file name="statut7.png">f2681caacd54b4b43912e489c678a3ec</md5file>
-<md5file name="login_background.png">8ace5113760f987144f54425afffd195</md5file>
-<md5file name="object_calendarday.png">fa5f8193240995285a30de76a124744c</md5file>
-<md5file name="title.png">2f7a8a40835764d2d62357e2ecbd1d28</md5file>
-<md5file name="call_out.png">a346bdb285fe8580f4b5b8dd5f5451ef</md5file>
-<md5file name="object_skype.png">9b70d8debaa8065353104c699e328325</md5file>
-<md5file name="object_projectpub.png">cbf00fbe06d62b8503f79d19005b84d5</md5file>
-<md5file name="stcomm1.png">c48848adc73b20b6a2e52888c8a7f9f9</md5file>
-<md5file name="1updownarrow.png">4ab5cf779b6ba8737731bd949438e279</md5file>
-<md5file name="calendar.png">f6c51890eb3d84defb470c9101e0e1fa</md5file>
-<md5file name="object_contact.png">db77b35764831af0b616bcc87ccda46d</md5file>
-<md5file name="object_cron.png">2fce4bf86219c914595c178c2d7e13f3</md5file>
-<md5file name="printer.png">e1d1617bee72d1951d3eaa02525726d1</md5file>
-<md5file name="disable.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="editdelete.png">9e36c55b53a1b080066d9947a92d2ce3</md5file>
-<md5file name="object_askpricesupplier.png">8f120e35f8b6608fb34e38edf9a2687c</md5file>
-<md5file name="object_intervention.png">a9e38adb81052e1178a2486de8a87c28</md5file>
-<md5file name="switch_off.png">7389cc51b77b11b297ccce79048a1c7f</md5file>
-<md5file name="object_payment.png">0474bee65715fc6918a92b668178be6c</md5file>
-<md5file name="stats.png">c5f9a0849fc60d9d903496e6752a8961</md5file>
-<md5file name="lock.png">a65c4d66168635b87ecbc720e2a50703</md5file>
-<md5file name="redstar.png">7921881e4e473d7284ea741addbe8810</md5file>
-<md5file name="object_billd.png">c64ea6bf2afef2560c8b642972b04663</md5file>
-<md5file name="object_product.png">3b719c139541347e5d868dc81867d444</md5file>
-<md5file name="statut9.png">752f4b5e92e81b70cae0ddc1be19e468</md5file>
-<md5file name="bg-bas-rubrique.png">4ee61217dbfae0266feb5345aab311cf</md5file>
-<md5file name="object_task_time.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="search.png">5305cd35321214f507640a0fa458a83b</md5file>
-<md5file name="statut5.png">0ddff84d392b7fa485c6e47623f9885b</md5file>
-<md5file name="switch_on.png">a6212b5e4fec967f17c519c9c6ce0171</md5file>
-<md5file name="sort_desc.png">74ec0398a7ef045c66ac8a7a60f93fb0</md5file>
-<md5file name="bg-rubrique.png">a174947c846b0105d6556d7497e5d2ab</md5file>
-<md5file name="object_billa.png">bf803d2d0ea860bbc5e35c4b6decc800</md5file>
-<md5file name="object_calendar.png">d5f4a934ec62542d5273a41e8fbcfe24</md5file>
-<md5file name="object_project.png">4454d66db639f71ab544b163923181fa</md5file>
-<md5file name="object_phoning_fax.png">7fd720194f42e7c1ae62927d6adfc046</md5file>
-<md5file name="sort_asc.png">7fb6e9956e37e06daaf1510132bceb78</md5file>
-<md5file name="object_order.png">b72c3b6c763f26a3ffc3c2d6c0f6d49c</md5file>
-<md5file name="close.png">10feed256eef9b9ba87cf7fa3ac0ef36</md5file>
-<md5file name="edit_remove.png">e1d238ddd4e573b085cc34b028b24883</md5file>
-<md5file name="gradient.gif">a03c8d2492d0ca2404593ec71b479eaf</md5file>
-<md5file name="object_globe.png">12bd3c14cc3b96cf90d3362573d85559</md5file>
-<md5file name="menutab-r.png">e8673277dd7383120e5f9028d0caccb6</md5file>
-<md5file name="statut6.png">60805f7fdcc0a187defb87f4ecfd9bb3</md5file>
-<md5file name="object_propal.png">8f120e35f8b6608fb34e38edf9a2687c</md5file>
-<md5file name="background.png">bdca821b84171d36d4ad692ad9c11742</md5file>
-<md5file name="info.png">d438bd3c5e0f59d1152dcaaf951c6ab6</md5file>
-<md5file name="recent.png">16f911dcd53ddf0a2c59fe6173f892f8</md5file>
-<md5file name="stcomm4.png">79a72d08df258b0ca33c240c1d7746c5</md5file>
-<md5file name="object_reduc.png">cc9d3aa2b9dd98d94377e40b25935c24</md5file>
-<md5file name="object_account.png">739a60ba606586c88e8626e558f16807</md5file>
-<md5file name="object_margin.png">c6a9a7d9cc31a6f650c60a8012a0d0d3</md5file>
-<md5file name="stcomm0.png">593b86c8523823ae956999f052556265</md5file>
-<md5file name="logout.png">77f0ae9331e8236008cc00b6c3c9e653</md5file>
-<md5file name="stcomm2.png">9d3d0f55c282fc3544043027b119cf37</md5file>
-<md5file name="off.png">9ad922c1fdc252eb8e61dbfdcf32ada5</md5file>
-<md5file name="object_projecttask.png">03ffa8f7c09dcea59dd5c89f136c7da6</md5file>
-<md5file name="statut8.png">4a436addc8ecc176da90d6f8e7ca0a8a</md5file>
-<md5file name="button_bg.png">115c4806f36aeb531699b370720312c4</md5file>
-<md5file name="delete.png">6de932fcb9805ce7f843721958c34a41</md5file>
-<md5file name="statut4.png">8475cd05414226f2ff20ee97df8bcf31</md5file>
-</dir>
-<dir name="/theme" >
-<md5file name="dolistore_logo.png">f6824fe35ddbed045eea82cb1612c2fb</md5file>
-<md5file name="dolibarr.png">263890251d7bbc4c692caa22c2c00dca</md5file>
-</dir>
-<dir name="/cron" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/cron/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cron.php">94db7d62efd46fd1069e2fdc796ec48b</md5file>
-</dir>
-<dir name="/cron" >
-<md5file name="card.php">169bd07ae16fbd983f38b6d19e7e3ff5</md5file>
-</dir>
-<dir name="/cron/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="cronjob.class.php">3490105a0c0d7976ccb8ac93c595262b</md5file>
-</dir>
-<dir name="/cron" >
-<md5file name="info.php">016d324c588d6ce78db3c6625c5b86fc</md5file>
-<md5file name="list.php">d2c519cac686043d7686769a322fd1b5</md5file>
-</dir>
-<dir name="/commande" >
-<md5file name="customer.php">c1d33938283415cd00527289b0d7c3f6</md5file>
-</dir>
-<dir name="/commande/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">2543eee751616a5c74e1bb37c5d64ae4</md5file>
-</dir>
-<dir name="/commande/stats" >
-<md5file name="index.php">e611f5c3d04bc4bd9cdee4a9a5af6d0a</md5file>
-</dir>
-<dir name="/commande" >
-<md5file name="document.php">11689e5722e4204b9d01e5e4483b92ef</md5file>
-<md5file name="card.php">08938fc6d6d375cf72fb4a9e14b1f3c2</md5file>
-<md5file name="note.php">a20a84fb09238e216ab80d91674426b1</md5file>
-</dir>
-<dir name="/commande/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="commandestats.class.php">bc3aa842090496571e579929dbb67946</md5file>
-<md5file name="commande.class.php">20d05f87e3dcc4cc34783e807d53af33</md5file>
-<md5file name="api_commande.class.php">70c0bcc71422c17305e134929089ed0a</md5file>
-</dir>
-<dir name="/commande" >
-<md5file name="contact.php">96a92bc03a6ca67f39d363c36031dee7</md5file>
-<md5file name="index.php">353d0788a1b27e81a7c62446ca190de1</md5file>
-<md5file name="orderstoinvoice.php">24ec433a2020143f3a634ff9bf695024</md5file>
-<md5file name="info.php">5e1aea18f899b4a763a0291dcf1f2b90</md5file>
-<md5file name="list.php">3d9e24b7399dffbfbd97e4e63efb30b6</md5file>
-<md5file name="apercu.php">9dd4c109f77db954d5afcb20d5af9e4c</md5file>
-</dir>
-<dir name="/contrat/tpl" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="linkedobjectblock.tpl.php">94c20a3f71b938c9767819f9216393d3</md5file>
-</dir>
-<dir name="/contrat/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="contractdet_extrafields.php">49b80ae086fa525ee4c7186729019611</md5file>
-<md5file name="contract_extrafields.php">0c789db58d34dba3a6000264c0d895c7</md5file>
-</dir>
-<dir name="/contrat" >
-<md5file name="document.php">24b8f65ab4a24ff8241b8af469928f75</md5file>
-<md5file name="card.php">faee7623b7d24024c8f024cf8d523736</md5file>
-<md5file name="note.php">7770e9e8e3fb4b98bc149059c5bc9633</md5file>
-</dir>
-<dir name="/contrat/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="contrat.class.php">88b846ea65a9fba4dc31bbf408820f24</md5file>
-</dir>
-<dir name="/contrat" >
-<md5file name="contact.php">7b7cde9c324feeed6e94f50e1655ba40</md5file>
-<md5file name="services.php">61e24a32c8c6bbf13272f96433a9584e</md5file>
-<md5file name="index.php">984c0b75c89d9ef9fef1fb68dd727448</md5file>
-<md5file name="info.php">966129fc8b4d82883741779cf87ea57a</md5file>
-<md5file name="list.php">4291524b8a1b72ba1dddf8210dd394a7</md5file>
-</dir>
-<dir name="/expensereport" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/expensereport/stats" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="index.php">9382e7efb69651b29045f2421d618717</md5file>
-</dir>
-<dir name="/expensereport" >
-<md5file name="document.php">0b959ec99ed9ee63f065c7d40454b9ec</md5file>
-<md5file name="card.php">f406b3b391eb6648f00807bbfd3ecaec</md5file>
-</dir>
-<dir name="/expensereport/ajax" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="ajaxprojet.php">0be386b7e05e9b798c974dcd8471d300</md5file>
-</dir>
-<dir name="/expensereport/payment" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="card.php">cb7d56d6c48746ab5a1230b020b21475</md5file>
-<md5file name="payment.php">03c8aefc955ba78bc334718fd8e48f8d</md5file>
-</dir>
-<dir name="/expensereport/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="paymentexpensereport.class.php">4b66ffd93217cb14fa44393d7ed28995</md5file>
-<md5file name="expensereport.class.php">7a3cae542041eaa003ce58a9ff3dc82b</md5file>
-<md5file name="expensereportstats.class.php">419a141c971f0a5edd4c8d19ac6f9741</md5file>
-</dir>
-<dir name="/expensereport" >
-<md5file name="export_csv.php">1f014c58fdf956eabae16c7b8774b02a</md5file>
-<md5file name="index.php">dd36572d1e317345996c521a9ce5c221</md5file>
-<md5file name="info.php">9abec172cb37c2446866c25c2ce36671</md5file>
-<md5file name="list.php">ad18616245d53b066a8287e98845a8a8</md5file>
-<md5file name="synchro_compta.php">66b616b872ef80968c8525b6b14f62fa</md5file>
-</dir>
-<dir name="/bookmarks" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-</dir>
-<dir name="/bookmarks/admin" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="bookmark.php">dd9a6717531dc3053943e016f017124a</md5file>
-</dir>
-<dir name="/bookmarks" >
-<md5file name="card.php">34bc13e73d4cd8217daf337a13593963</md5file>
-<md5file name="bookmarks.lib.php">46585b9b2118933add2b0efcac54d055</md5file>
-</dir>
-<dir name="/bookmarks/class" >
-<md5file name="index.html">d41d8cd98f00b204e9800998ecf8427e</md5file>
-<md5file name="bookmark.class.php">172fde67b2620ef8febd816161712c8f</md5file>
-</dir>
-<dir name="/bookmarks" >
-<md5file name="list.php">c8794336eba88e9ce0af56f8b5cded4d</md5file>
-</dir>
-</dolibarr_htdocs_dir>
-<dolibarr_script_dir version="3.8.1">
-<dir name="/contracts" >
-<md5file name="email_expire_services_to_representatives.php">7c7d00777d21ed95c127af574c6ec4dc</md5file>
-<md5file name="email_expire_services_to_customers.php">391071254a71e5fe29f6a22cbfc27543</md5file>
-</dir>
-<dir name="/bank" >
-<md5file name="export-bank-receipts.php">d87e04818900b16e33d6ff072bb96ac4</md5file>
-</dir>
-<dir name="/invoices" >
-<md5file name="email_unpaid_invoices_to_representatives.php">db1873d6baf2f70e94105ee43cc72633</md5file>
-<md5file name="email_unpaid_invoices_to_customers.php">a9a4cf07f35679b20f9024bc4de3b3d5</md5file>
-<md5file name="rebuild_merge_pdf.php">257ff234c2372ad89a1f45f5d1b418ee</md5file>
-</dir>
-<dir name="/product" >
-<md5file name="migrate_picture_path.php">5fd136bf4934520ef298c6a3afd58a4e</md5file>
-</dir>
-<dir name="/emailings" >
-<md5file name="mailing-send.php">6aab5f541a8f35b6e04cdaa94e51bcfa</md5file>
-</dir>
-<dir name="/company" >
-<md5file name="export-contacts-xls-example.php">b63ae515c552eb1b143cedb9f80b7e4f</md5file>
-<md5file name="sync_contacts_dolibarr2ldap.php">8e8a66035dd90a4e18ba500469166691</md5file>
-</dir>
-<dir name="/accountancy" >
-<md5file name="export-thirdpartyaccount.php">d9fbd3c65ab7d5dcf5152ea76a605ea5</md5file>
-</dir>
-<dir name="/withdrawals" >
-<md5file name="build_withdrawal_file.php">b65459b4d85b0f5c0aa1db76025ee46e</md5file>
-</dir>
-<dir name="/user" >
-<md5file name="sync_groups_dolibarr2ldap.php">c8375c535010671604b34b320866da37</md5file>
-<md5file name="sync_groups_ldap2dolibarr.php">a5078a8ad692716abbc697b629f2cedb</md5file>
-<md5file name="sync_users_ldap2dolibarr.php">e76a888f442774b3908a2beb35bc9f87</md5file>
-<md5file name="sync_users_dolibarr2ldap.php">a79b4df688dc6f03a468c89cf9345295</md5file>
-</dir>
-<dir name="/members" >
-<md5file name="sync_members_ldap2dolibarr.php">d4034e549bfe8fff645d8d8978261d55</md5file>
-<md5file name="sync_members_dolibarr2ldap.php">69d546f3721f5c2695535a92bad97221</md5file>
-</dir>
-<dir name="/cron" >
-<md5file name="cron_run_jobs.php">bfcb5fb6ed7ec4fe114b3088b89d3687</md5file>
-</dir>
-</dolibarr_script_dir>
-</checksum_list>

From 74be7bf334c5407e43d3eddccfd61581487acd65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 11:40:06 +0100
Subject: [PATCH 109/216] FIX Filter in customer price per product of a
 thirdparty returned error

---
 htdocs/societe/price.php | 75 ++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index f1388530317..7898f543507 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -44,16 +44,16 @@ $langs->load("bills");
 $action = GETPOST('action', 'alpha');
 
 // Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
 if ($user->societe_id)
 	$socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
-/**
- * ***************************************************
- * Price by customer
- * ****************************************************
+
+/*
+ * Actions
  */
+
 if ($action == 'add_customer_price_confirm' && ! $_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
 	$update_child_soc = GETPOST('updatechildprice');
@@ -114,91 +114,92 @@ if ($action == 'update_customer_price_confirm' && ! $_POST ["cancel"] && ($user-
 	$action = '';
 }
 
+
 /*
  * View
  */
 
 $form = new Form($db);
 
-$soc = new Societe($db);
+$object = new Societe($db);
 
-$result = $soc->fetch($socid);
+$result = $object->fetch($socid);
 llxHeader("", $langs->trans("ThirdParty") . '-' . $langs->trans('PriceByCustomer'));
 
 if (! empty($conf->notification->enabled))
 	$langs->load("mails");
-$head = societe_prepare_head($soc);
+$head = societe_prepare_head($object);
 
 dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), 0, 'company');
 
 print '<table class="border" width="100%">';
 
 print '<tr><td width="25%">' . $langs->trans("ThirdPartyName") . '</td><td colspan="3">';
-print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom');
+print $form->showrefnav($object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 print '</td></tr>';
 
 // Alias names (commercial, trademark or alias names)
 print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
-print $soc->name_alias;
+print $object->name_alias;
 print "</td></tr>";
 
 if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
 {
-	print '<tr><td>' . $langs->trans('Prefix') . '</td><td colspan="3">' . $soc->prefix_comm . '</td></tr>';
+	print '<tr><td>' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
 
-if ($soc->client) {
+if ($object->client) {
 	print '<tr><td>';
 	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
-	print $soc->code_client;
-	if ($soc->check_codeclient() != 0)
+	print $object->code_client;
+	if ($object->check_codeclient() != 0)
 		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
 	print '</td></tr>';
 }
 
-if ($soc->fournisseur) {
+if ($object->fournisseur) {
 	print '<tr><td>';
 	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
-	print $soc->code_fournisseur;
-	if ($soc->check_codefournisseur() != 0)
+	print $object->code_fournisseur;
+	if ($object->check_codefournisseur() != 0)
 		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
 	print '</td></tr>';
 }
 
 if (! empty($conf->barcode->enabled)) {
-	print '<tr><td>' . $langs->trans('Gencod') . '</td><td colspan="3">' . $soc->barcode . '</td></tr>';
+	print '<tr><td>' . $langs->trans('Gencod') . '</td><td colspan="3">' . $object->barcode . '</td></tr>';
 }
 
 print "<tr><td>" . $langs->trans('Address') . "</td><td colspan=\"3\">";
-dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id);
+dol_print_address($object->address, 'gmap', 'thirdparty', $object->id);
 print "</td></tr>";
 
 // Zip / Town
-print '<tr><td width="25%">' . $langs->trans('Zip') . '</td><td width="25%">' . $soc->zip . "</td>";
-print '<td width="25%">' . $langs->trans('Town') . '</td><td width="25%">' . $soc->town . "</td></tr>";
+print '<tr><td width="25%">' . $langs->trans('Zip') . '</td><td width="25%">' . $object->zip . "</td>";
+print '<td width="25%">' . $langs->trans('Town') . '</td><td width="25%">' . $object->town . "</td></tr>";
 
 // Country
-if ($soc->country) {
+if ($object->country) {
 	print '<tr><td>' . $langs->trans('Country') . '</td><td colspan="3">';
-	$img = picto_from_langcode($soc->country_code);
+	$img = picto_from_langcode($object->country_code);
 	print($img ? $img . ' ' : '');
-	print $soc->country;
+	print $object->country;
 	print '</td></tr>';
 }
 
 // EMail
 print '<tr><td>' . $langs->trans('EMail') . '</td><td colspan="3">';
-print dol_print_email($soc->email, 0, $soc->id, 'AC_EMAIL');
+print dol_print_email($object->email, 0, $object->id, 'AC_EMAIL');
 print '</td></tr>';
 
 // Web
 print '<tr><td>' . $langs->trans('Web') . '</td><td colspan="3">';
-print dol_print_url($soc->url);
+print dol_print_url($object->url);
 print '</td></tr>';
 
 // Phone / Fax
-print '<tr><td>' . $langs->trans('Phone') . '</td><td>' . dol_print_phone($soc->tel, $soc->country_code, 0, $soc->id, 'AC_TEL') . '</td>';
-print '<td>' . $langs->trans('Fax') . '</td><td>' . dol_print_phone($soc->fax, $soc->country_code, 0, $soc->id, 'AC_FAX') . '</td></tr>';
+print '<tr><td>' . $langs->trans('Phone') . '</td><td>' . dol_print_phone($object->tel, $object->country_code, 0, $object->id, 'AC_TEL') . '</td>';
+print '<td>' . $langs->trans('Fax') . '</td><td>' . dol_print_phone($object->fax, $object->country_code, 0, $object->id, 'AC_FAX') . '</td></tr>';
 
 print '</table>';
 
@@ -224,7 +225,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		// Build filter to diplay only concerned lines
 	$filter = array (
-		't.fk_soc' => $soc->id
+		't.fk_soc' => $object->id
 	);
 
 	$search_soc = GETPOST('search_soc');
@@ -238,10 +239,10 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print_fiche_titre($langs->trans('PriceByCustomer'));
 
-		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '" method="POST">';
+		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
-		print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+		print '<input type="hidden" name="socid" value="' . $object->id . '">';
 		print '<table class="border" width="100%">';
 		print '<tr>';
 		print '<td>' . $langs->trans('Product') . '</td>';
@@ -316,7 +317,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			setEventMessage($prodcustprice->error, 'errors');
 		}
 
-		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '" method="POST">';
+		print '<form action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
 		print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
 		print '<input type="hidden" name="lineid" value="' . $prodcustprice->id . '">';
@@ -456,7 +457,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		}
 
 		print "\n" . '<div class="tabsAction">' . "\n";
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $soc->id . '">' . $langs->trans("Ok") . '</a></div>';
+		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '">' . $langs->trans("Ok") . '</a></div>';
 		print "\n</div><br>\n";
 	} else {
 
@@ -536,15 +537,15 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				// Action
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
 					print '<td align="right">';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $soc->id . '&amp;prodid=' . $line->fk_product . '">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&amp;socid=' . $object->id . '&amp;prodid=' . $line->fk_product . '">';
 					print img_info();
 					print '</a>';
 					print ' ';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
 					print img_edit('default', 0, 'style="vertical-align: middle;"');
 					print '</a>';
 					print ' ';
-					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $soc->id . '&amp;lineid=' . $line->id . '">';
+					print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&amp;socid=' . $object->id . '&amp;lineid=' . $line->id . '">';
 					print img_delete('default', 'style="vertical-align: middle;"');
 					print '</a>';
 					print '</td>';
@@ -568,7 +569,7 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n" . '<div class="tabsAction">' . "\n";
 
 		if ($user->rights->produit->creer || $user->rights->service->creer) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $soc->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&amp;socid=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
 		}
 		print "\n</div><br>\n";
 	}

From df4f09e72f6b753321b28f4baf49cb6ad81e2526 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 14:02:36 +0100
Subject: [PATCH 110/216] FIX #3240

---
 htdocs/fourn/class/fournisseur.commande.class.php |  8 ++++----
 htdocs/fourn/commande/list.php                    | 14 ++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 51602cafe1c..7f475f87f24 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -2291,7 +2291,7 @@ class CommandeFournisseur extends CommonOrder
 
         $clause = " WHERE";
 
-        $sql = "SELECT c.rowid, c.date_creation as datec, c.fk_statut,c.date_livraison as delivery_date";
+        $sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
         $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
         if (!$user->rights->societe->client->voir && !$user->societe_id)
         {
@@ -2311,15 +2311,15 @@ class CommandeFournisseur extends CommonOrder
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->commande->fournisseur->warning_delay/60/60/24;
 	        $response->label=$langs->trans("SuppliersOrdersToProcess");
-	        $response->url=DOL_URL_ROOT.'/fourn/commande/index.php';
+	        $response->url=DOL_URL_ROOT.'/fourn/commande/list.php?statut=1,2,3';
 	        $response->img=img_object($langs->trans("Orders"),"order");
 
             while ($obj=$this->db->fetch_object($resql))
             {
                 $response->nbtodo++;
 
-				$date_to_test = empty($obj->delivery_date) ? $obj->datec : $obj->delivery_date;
-                if ($obj->fk_statut != 3 && $this->db->jdate($date_to_test) < ($now - $conf->commande->fournisseur->warning_delay)) {
+				$date_to_test = empty($obj->delivery_date) ? $obj->date_commande : $obj->delivery_date;
+                if ($obj->fk_statut != 3 && $date_to_test && $this->db->jdate($date_to_test) < ($now - $conf->commande->fournisseur->warning_delay)) {
 	                $response->nbtodolate++;
                 }
             }
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index c21830e66e8..1fffb05b738 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -88,8 +88,14 @@ if ($socid > 0)
 {
 	$fourn = new Fournisseur($db);
 	$fourn->fetch($socid);
-	$title .= ' ('.$fourn->name.')';
+	$title .= ' - '.$fourn->name;
 }
+if (GETPOST('statut','alpha')) 
+{
+    if (GETPOST('statut','alpha') == '1,2,3') $title.=' - '.$langs->trans("StatusOrderToProcessShort");
+    else $title.=' - '.$langs->trans($commandestatic->statuts[GETPOST('statut','alpha')]);
+}
+
 
 llxHeader('',$title);
 
@@ -145,9 +151,9 @@ if ($sall)
 if ($socid) $sql.= " AND s.rowid = ".$socid;
 
 //Required triple check because statut=0 means draft filter
-if (GETPOST('statut', 'int') !== '')
+if (GETPOST('statut', 'alpha') !== '')
 {
-	$sql .= " AND cf.fk_statut IN (".GETPOST('statut').")";
+	$sql .= " AND cf.fk_statut IN (".GETPOST('statut', 'alpha').")";
 }
 if ($search_refsupp)
 {
@@ -219,7 +225,7 @@ if ($resql)
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre" align="right">';
-	$formorder->selectSupplierOrderStatus($search_status,1,'search_status');
+	$formorder->selectSupplierOrderStatus((strstr($search_status, ',')?-1:$search_status),1,'search_status');
 	print '</td>';
 	print '<td class="liste_titre" align="right"><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 '<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")).'">';

From e3a42a78f210fcfb55b978fcf4304722fabd1448 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Tue, 3 Nov 2015 15:14:42 +0100
Subject: [PATCH 111/216] FIX all PDF hook must be in addreplace type, not
 return value to work as expected

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

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index a23977acebe..e7002e83aff 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -169,7 +169,7 @@ class HookManager
 				)
 			)) $hooktype='addreplace';
         // Deprecated hook types ('returnvalue')
-        if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue';		// pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks.
+        //if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue';		// pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks.
         if ($method == 'insertExtraFields')
         {
         	$hooktype='returnvalue';	// deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.

From 3ba194f638b25aac2c8b62c60fb6c8f4afdb3afd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 15:32:16 +0100
Subject: [PATCH 112/216] NEW Can select fields to show into the contact list

---
 htdocs/contact/list.php | 513 ++++++++++++++++++++++++++++++----------
 htdocs/societe/list.php |   7 +-
 2 files changed, 396 insertions(+), 124 deletions(-)

diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index ebe4c9c337d..ee5c24f3017 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -47,15 +47,16 @@ $search_firstname=GETPOST("search_firstname");
 $search_societe=GETPOST("search_societe");
 $search_poste=GETPOST("search_poste");
 $search_phone=GETPOST("search_phone");
-$search_phoneper=GETPOST("search_phoneper");
-$search_phonepro=GETPOST("search_phonepro");
-$search_phonemob=GETPOST("search_phonemob");
+$search_phone_perso=GETPOST("search_phone_perso");
+$search_phone_pro=GETPOST("search_phone_pro");
+$search_phone_mobile=GETPOST("search_phone_mobile");
 $search_fax=GETPOST("search_fax");
 $search_email=GETPOST("search_email");
 $search_skype=GETPOST("search_skype");
 $search_priv=GETPOST("search_priv");
 $search_categ=GETPOST("search_categ",'int');
 $search_status=GETPOST("search_status",'int');
+$search_type=GETPOST('search_type','alpha');
 if ($search_status=='') $search_status=1; // always display activ customer first
 
 $optioncss = GETPOST('optioncss','alpha');
@@ -77,47 +78,41 @@ $limit = $conf->liste_limit;
 $offset = $limit * $page;
 
 $langs->load("companies");
+
+$contextpage='contactlist';
 $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
 if ($type == "p")
 {
+    $contextpage='contactprospectlist';
 	$titre.='  ('.$langs->trans("ThirdPartyProspects").')';
 	$urlfiche="card.php";
 }
 if ($type == "c")
 {
+    $contextpage='contactcustomerlist';
 	$titre.='  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche="card.php";
 }
 else if ($type == "f")
 {
+    $contextpage='contactsupplierlist';
 	$titre.=' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche="card.php";
 }
 else if ($type == "o")
 {
+    $contextpage='contactotherlist';
 	$titre.=' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
 	$urlfiche="";
 }
 
-if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter'))	// All tests are required to be compatible with all browsers
-{
-    $sall="";
-    $search_firstlast_only="";
-    $search_lastname="";
-    $search_firstname="";
-    $search_societe="";
-    $search_poste="";
-    $search_phone="";
-    $search_phoneper="";
-    $search_phonepro="";
-    $search_phonemob="";
-    $search_fax="";
-    $search_email="";
-    $search_skype="";
-    $search_priv="";
-    $seach_status=1;
-}
-if ($search_priv < 0) $search_priv='';
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array($contextpage));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('contact');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
@@ -128,21 +123,65 @@ $fieldstosearchall = array(
 );
 
 
+/*
+ * Actions
+ */
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters);    // 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 (empty($reshook))
+{
+
+}
+
+if (GETPOST('button_removefilter_x') || GETPOST('button_removefilter.x') || GETPOST('button_removefilter'))	// All tests are required to be compatible with all browsers
+{
+    $sall="";
+    $search_firstlast_only="";
+    $search_lastname="";
+    $search_firstname="";
+    $search_societe="";
+    $search_poste="";
+    $search_phone="";
+    $search_phone_perso="";
+    $search_phone_pro="";
+    $search_phone_mobile="";
+    $search_fax="";
+    $search_email="";
+    $search_skype="";
+    $search_priv="";
+    $search_status=-1;
+}
+if ($search_priv < 0) $search_priv='';
+
+
 /*
  * View
  */
 
+$form=new Form($db);
+$formother=new FormOther($db);
+$contactstatic=new Contact($db);
+
 $title = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 llxHeader('',$title,'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
 
-$form=new Form($db);
-$formother=new FormOther($db);
-
 $sql = "SELECT s.rowid as socid, s.nom as name,";
-$sql.= " p.rowid as cidp, p.lastname as lastname, p.statut, p.firstname, 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.tms,";
+$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.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
+foreach ($extrafields->attribute_label as $key => $val) $sql.=",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."socpeople as p";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contact_extrafields as ef on (p.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 if (! empty($search_categ)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cs ON p.rowid = cs.fk_socpeople"; // We need this table joined to the select in order to filter by categ
@@ -190,17 +229,17 @@ if (strlen($search_phone))
 {
     $sql .= " AND (p.phone LIKE '%".$db->escape($search_phone)."%' OR p.phone_perso LIKE '%".$db->escape($search_phone)."%' OR p.phone_mobile LIKE '%".$db->escape($search_phone)."%')";
 }
-if (strlen($search_phoneper))
+if (strlen($search_phone_perso))
 {
-    $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phoneper)."%'";
+    $sql .= " AND p.phone_perso LIKE '%".$db->escape($search_phone_perso)."%'";
 }
-if (strlen($search_phonepro))
+if (strlen($search_phone_pro))
 {
-    $sql .= " AND p.phone LIKE '%".$db->escape($search_phonepro)."%'";
+    $sql .= " AND p.phone LIKE '%".$db->escape($search_phone_pro)."%'";
 }
-if (strlen($search_phonemob))
+if (strlen($search_phone_mobile))
 {
-    $sql .= " AND p.phone_mobile LIKE '%".$db->escape($search_phonemob)."%'";
+    $sql .= " AND p.phone_mobile LIKE '%".$db->escape($search_phone_mobile)."%'";
 }
 if (strlen($search_fax))
 {
@@ -214,7 +253,7 @@ if (strlen($search_skype))      // filtre sur skype
 {
     $sql .= " AND p.skype LIKE '%".$db->escape($search_skype)."%'";
 }
-if ($search_status!='') $sql .= " AND p.statut = ".$db->escape($search_status);
+if ($search_status != '' && $search_status >= 0) $sql .= " AND p.statut = ".$db->escape($search_status);
 if ($type == "o")        // filtre sur type
 {
     $sql .= " AND p.fk_soc IS NULL";
@@ -239,6 +278,24 @@ if (! empty($socid))
 {
     $sql .= " AND s.rowid = ".$socid;
 }
+// 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'))) $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;
+
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -246,6 +303,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
     $result = $db->query($sql);
     $nbtotalofrecords = $db->num_rows($result);
 }
+
 // Add order and limit
 if($view == "recent")
 {
@@ -263,23 +321,39 @@ dol_syslog("contact/list.php", LOG_DEBUG);
 $result = $db->query($sql);
 if ($result)
 {
-	$contactstatic=new Contact($db);
-
-    $param ='&begin='.htmlspecialchars($begin).'&view='.htmlspecialchars($view).'&userid='.htmlspecialchars($userid).'&contactname='.htmlspecialchars($sall);
-    $param.='&type='.htmlspecialchars($type).'&view='.htmlspecialchars($view).'&search_lastname='.htmlspecialchars($search_lastname).'&search_firstname='.htmlspecialchars($search_firstname).'&search_societe='.htmlspecialchars($search_societe).'&search_email='.htmlspecialchars($search_email);
-    if (!empty($search_categ)) $param.='&search_categ='.htmlspecialchars($search_categ);
-    if ($search_status != '') $param.='&amp;search_status='.htmlspecialchars($search_status);
-    if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".htmlspecialchars($search_priv);
-    if ($optioncss != '') $param.='&optioncss='.$optioncss;
-
 	$num = $db->num_rows($result);
     $i = 0;
 
+	$param ='&begin='.urlencode($begin).'&view='.urlencode($view).'&userid='.urlencode($userid).'&contactname='.urlencode($sall);
+    $param.='&type='.urlencode($type).'&view='.urlencode($view).'&search_lastname='.urlencode($search_lastname).'&search_firstname='.urlencode($search_firstname).'&search_societe='.urlencode($search_societe).'&search_email='.urlencode($search_email);
+    if (!empty($search_categ)) $param.='&search_categ='.urlencode($search_categ);
+    if ($search_lastname != '') $param.='&amp;search_lastname='.urlencode($search_lastname);
+    if ($search_firstname != '') $param.='&amp;search_firstname='.urlencode($search_firstname);
+    if ($search_zip != '') $param.='&amp;search_zip='.urlencode($search_zip);
+    if ($search_town != '') $param.='&amp;search_town='.urlencode($search_town);
+    if ($search_job != '') $param.='&amp;search_job='.urlencode($search_job);
+    if ($search_phone_pro != '') $param.='&amp;search_phone_pro='.urlencode($search_phone_pro);
+    if ($search_phone_perso != '') $param.='&amp;search_phone_perso='.urlencode($search_phone_perso);
+    if ($search_phone_mobile != '') $param.='&amp;search_phone_mobile='.urlencode($search_phone_mobile);
+    if ($search_fax != '') $param.='&amp;search_fax='.urlencode($search_fax);
+    if ($search_email != '') $param.='&amp;search_email='.urlencode($search_email);
+    if ($search_status != '') $param.='&amp;search_status='.urlencode($search_status);
+    if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv);
+    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);
+    } 	
+    
     print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,'title_companies.png');
 
     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'].'">';
+	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.'">';
@@ -306,75 +380,199 @@ if ($result)
     {
     	print '<div class="liste_titre liste_titre_bydiv centpercent">';
     	print $moreforfilter;
+    	$parameters=array('type'=>$type);
+    	$reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	    print $hookmanager->resPrint;
     	print '</div>';
     }
 
+	$arrayfields=array(
+        'p.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1),
+        'p.firstname'=>array('label'=>$langs->trans("Firsname"), 'checked'=>1),
+        'p.poste'=>array('label'=>$langs->trans("Post"), 'checked'=>1),
+	    'p.town'=>array('label'=>$langs->trans("Town"), 'checked'=>0),
+        'p.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>0),
+	    'p.phone'=>array('label'=>$langs->trans("PhonePro"), 'checked'=>1),
+	    'p.phone_perso'=>array('label'=>$langs->trans("PhonePerso"), 'checked'=>0),
+	    'p.phone_mobile'=>array('label'=>$langs->trans("PhoneMobile"), 'checked'=>1),
+	    'p.fax'=>array('label'=>$langs->trans("Fax"), 'checked'=>1),
+	    'p.email'=>array('label'=>$langs->trans("Email"), 'checked'=>1),
+	    'p.skype'=>array('label'=>$langs->trans("Skype"), 'checked'=>1, 'enabled'=>(! empty($conf->skype->enabled))),
+	    'p.thirdparty'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>empty($conf->global->SOCIETE_DISABLE_CONTACTS)),
+	    'p.priv'=>array('label'=>$langs->trans("ContactVisibility"), 'checked'=>1, 'position'=>200),
+        'p.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
+        'p.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
+        'p.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]);
+	   }
+	}
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
 	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
 
     // Ligne des titres
     print '<tr class="liste_titre">';
-    print_liste_field_titre($langs->trans("Lastname"),$_SERVER["PHP_SELF"],"p.lastname", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Firstname"),$_SERVER["PHP_SELF"],"p.firstname", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("PostOrFunction"),$_SERVER["PHP_SELF"],"p.poste", $begin, $param, '', $sortfield,$sortorder);
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Phone"),$_SERVER["PHP_SELF"],"p.phone", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("PhoneMobile"),$_SERVER["PHP_SELF"],"p.phone_mobile", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Fax"),$_SERVER["PHP_SELF"],"p.fax", $begin, $param, '', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder);
-    if (! empty($conf->skype->enabled)) { print_liste_field_titre($langs->trans("Skype"),$_SERVER["PHP_SELF"],"p.skype", $begin, $param, '', $sortfield,$sortorder); }
-    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder);
-    print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut", $begin, $param, 'align="center"', $sortfield,$sortorder);
-    print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
+    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 '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_lastname" size="9" value="'.dol_escape_htmltag($search_lastname).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_firstname" size="9" value="'.dol_escape_htmltag($search_firstname).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_poste" size="9" value="'.dol_escape_htmltag($search_poste).'">';
-    print '</td>';
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+    if (! empty($arrayfields['p.lastname']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input class="flat" type="text" name="search_societe" size="9" value="'.dol_escape_htmltag($search_societe).'">';
+        print '<input class="flat" type="text" name="search_lastname" size="6" value="'.dol_escape_htmltag($search_lastname).'">';
         print '</td>';
     }
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_phonepro" size="8" value="'.dol_escape_htmltag($search_phonepro).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_phonemob" size="8" value="'.dol_escape_htmltag($search_phonemob).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_fax" size="8" value="'.dol_escape_htmltag($search_fax).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" name="search_email" size="8" value="'.dol_escape_htmltag($search_email).'">';
-    print '</td>';
-    if (! empty($conf->skype->enabled))
+    if (! empty($arrayfields['p.lastname']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input class="flat" type="text" name="search_skype" size="8" value="'.dol_escape_htmltag($search_skype).'">';
+        print '<input class="flat" type="text" name="search_firstname" size="6" value="'.dol_escape_htmltag($search_firstname).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.poste']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_poste" size="5" value="'.dol_escape_htmltag($search_poste).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.zip']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_zip" size="3" value="'.dol_escape_htmltag($search_zip).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.town']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_town" size="5" value="'.dol_escape_htmltag($search_town).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.phone']['checked'])) 
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_phone_pro" size="6" value="'.dol_escape_htmltag($search_phone_pro).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.phone_perso']['checked'])) 
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_phone_perso" size="6" value="'.dol_escape_htmltag($search_phone_perso).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.phone_mobile']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_phone_mobile" size="6" value="'.dol_escape_htmltag($search_phone_mobile).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.fax']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_fax" size="6" value="'.dol_escape_htmltag($search_fax).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.email']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_email" size="6" value="'.dol_escape_htmltag($search_email).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.skype']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_skype" size="6" value="'.dol_escape_htmltag($search_skype).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.thirdparty']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '<input class="flat" type="text" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['p.priv']['checked']))
+    {
+        print '<td class="liste_titre" align="center">';
+	   $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
+	   print $form->selectarray('search_priv',$selectarray,$search_priv,1);
+	   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 class="liste_titre">';
+				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['p.datec']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Date modification
+    if (! empty($arrayfields['p.tms']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    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>';
     }
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="center">';
-	$selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate"));
-	print $form->selectarray('search_priv',$selectarray,$search_priv,1);
-	print '</td>';
-	 print '<td class="liste_titre" align="center">';
-    print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status);
-    print '</td>';
     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")).'">';
     print '</td>';
+    
     print '</tr>';
 
     $var=True;
@@ -385,8 +583,6 @@ if ($result)
 		$var=!$var;
         print "<tr ".$bc[$var].">";
 
-		// Name
-		print '<td valign="middle">';
 		$contactstatic->lastname=$obj->lastname;
 		$contactstatic->firstname='';
 		$contactstatic->id=$obj->cidp;
@@ -395,17 +591,68 @@ if ($result)
 		$contactstatic->phone_pro=$obj->phone_pro;
 		$contactstatic->phone_perso=$obj->phone_perso;
 		$contactstatic->phone_mobile=$obj->phone_mobile;
-		print $contactstatic->getNomUrl(1,'',20);
-		print '</td>';
-
+		$contactstatic->zip=$obj->zip;
+		$contactstatic->town=$obj->town;
+        
+        // Name
+        if (! empty($arrayfields['p.lastname']['checked']))
+        {
+            print '<td valign="middle">';
+		  print $contactstatic->getNomUrl(1,'',20);
+		  print '</td>';
+        }
 		// Firstname
-        print '<td>'.dol_trunc($obj->firstname,20).'</td>';
-
-		// Function
-        print '<td>'.dol_trunc($obj->poste,20).'</td>';
-
+        if (! empty($arrayfields['p.firstname']['checked']))
+        {
+            print '<td>'.dol_trunc($obj->firstname,20).'</td>';
+        }
+    	// Zip
+        if (! empty($arrayfields['p.zip']['checked']))
+        {
+            print '<td>'.dol_trunc($obj->zip,20).'</td>';
+        }
+    	// Town
+        if (! empty($arrayfields['p.town']['checked']))
+        {
+            print '<td>'.dol_trunc($obj->town,20).'</td>';
+        }
+        // Function
+        if (! empty($arrayfields['p.poste']['checked']))
+        {
+            print '<td>'.dol_trunc($obj->poste,20).'</td>';
+        }
+        // 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>';
+        }
+        // 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>';
+        }
+        // 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>';
+        }
+        // Fax
+        if (! empty($arrayfields['p.fax']['checked']))
+        {
+            print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->cidp,$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>';
+        }
+        // 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>'; }
+        }
         // Company
-        if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+        if (! empty($arrayfields['p.thirdparty']['checked']))
         {
     		print '<td>';
             if ($obj->socid)
@@ -420,27 +667,53 @@ if ($result)
             print '</td>';
         }
 
-        // Phone
-        print '<td>'.dol_print_phone($obj->phone_pro,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
-        // Phone mobile
-        print '<td>'.dol_print_phone($obj->phone_mobile,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
-        // Fax
-        print '<td>'.dol_print_phone($obj->fax,$obj->country_code,$obj->cidp,$obj->socid,'AC_TEL').'</td>';
-        // EMail
-        print '<td>'.dol_print_email($obj->email,$obj->cidp,$obj->socid,'AC_EMAIL',18).'</td>';
-        // Skype
-        if (! empty($conf->skype->enabled)) { print '<td>'.dol_print_skype($obj->skype,$obj->cidp,$obj->socid,'AC_SKYPE',18).'</td>'; }
+        // Private/Public
+        if (! empty($arrayfields['p.priv']['checked']))
+        {
+		    print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
+        }
 
-		// Date
-		print '<td align="center">'.dol_print_date($db->jdate($obj->tms),"day").'</td>';
-
-		// Private/Public
-		print '<td align="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
-
-		// Status
-		print '<td align="center">'.$contactstatic->getLibStatut(3).'</td>';
-
-		// Links Add action and Export vcard
+		// 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>';
+				}
+		   }
+		}
+        // 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['p.datec']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
+            print '</td>';
+        }
+        // Date modification
+        if (! empty($arrayfields['p.tms']['checked']))
+        {
+            print '<td align="center">';
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+            print '</td>';
+        }
+	    // Status
+        if (! empty($arrayfields['p.statut']['checked']))
+        {
+            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 ' &nbsp; ';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index c8c25acdd24..3d234728a70 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -61,11 +61,10 @@ $search_idprof5=trim(GETPOST('search_idprof5'));
 $search_idprof6=trim(GETPOST('search_idprof6'));
 $search_sale=trim(GETPOST("search_sale",'int'));
 $search_categ=trim(GETPOST("search_categ",'int'));
-$search_type=trim(GETPOST('search_type'));
 $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
-$search_type=GETPOST('search_type','alpha');
 $search_status=GETPOST("search_status",'int');
+$search_type=GETPOST('search_type','alpha');
 $search_level_from = GETPOST("search_level_from","alpha");
 $search_level_to   = GETPOST("search_level_to","alpha");
 $search_stcomm=GETPOST('search_stcomm','int');
@@ -965,14 +964,14 @@ if ($resql)
         if (! empty($arrayfields['s.datec']['checked']))
         {
             print '<td align="center">';
-            print dol_print_date($obj->date_creation, 'dayhour');
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
             print '</td>';
         }
         // Date modification
         if (! empty($arrayfields['s.tms']['checked']))
         {
             print '<td align="center">';
-            print dol_print_date($obj->date_update, 'dayhour');
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
             print '</td>';
         }
 	    // Status

From 0d4c5c44522fec202cc9c2c2c5c14a1c8058092b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 15:33:45 +0100
Subject: [PATCH 113/216] Fix missing $db->jdate

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

diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 3af01d29046..28699839a18 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -523,14 +523,14 @@ if ($result)
         if (! empty($arrayfields['u.datec']['checked']))
         {
             print '<td align="center">';
-            print dol_print_date($obj->date_creation, 'dayhour');
+            print dol_print_date($db->jdate($obj->date_creation), 'dayhour');
             print '</td>';
         }
         // Date modification
         if (! empty($arrayfields['u.tms']['checked']))
         {
             print '<td align="center">';
-            print dol_print_date($obj->date_update, 'dayhour');
+            print dol_print_date($db->jdate($obj->date_update), 'dayhour');
             print '</td>';
         }
         // Status

From d5b77bdc5fee8d6a9aef119cba02f9bcb2fed0e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Nov 2015 19:51:07 +0100
Subject: [PATCH 114/216] Fix parameters are set at a better place

---
 htdocs/admin/pdf.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 7bd46ac9684..f75bf57a972 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -135,6 +135,12 @@ if ($action == 'edit')	// Edit
     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>';
 
+    // 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)
@@ -223,12 +229,6 @@ if ($action == 'edit')	// Edit
 	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>';
 
-    // Hide Tva Intra on adress
-    $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>';
-
     //Desc
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("HideDescOnPDF").'</td><td>';
@@ -303,6 +303,12 @@ else	// Show
     print '<table class="noborder" width="100%">';
     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)
@@ -386,13 +392,6 @@ else	// Show
     print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td width="200px" colspan="2">'.$langs->trans("Value").'</td></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>';
-
-
 	// Encrypt and protect PDF
 	$var=!$var;
 	print "<tr ".$bc[$var].">";
@@ -421,11 +420,11 @@ else	// Show
 	print "</td>";
 	print '</tr>';
 
-	// Hide Tva Intra on adress
-	$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>';
+    // 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;

From d362d889f661656d302940e0d29b8b4b42bd99b1 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Mon, 2 Nov 2015 00:05:45 +0100
Subject: [PATCH 115/216] wip

---
 htdocs/admin/receiptprinter.php               | 404 ++++++++++++++++++
 htdocs/cashdesk/admin/cashdesk.php            |  12 +
 htdocs/core/class/dolreceiptprinter.class.php | 314 +++++++++++---
 htdocs/core/lib/receiptprinter.lib.php        |  72 ++++
 .../core/modules/modReceiptPrinter.class.php  |   4 +-
 htdocs/langs/en_US/cashdesk.lang              |   1 +
 htdocs/langs/en_US/receiptprinter.lang        |  80 ++++
 htdocs/theme/common/dolibarr_logo_bw.png      | Bin 0 -> 791 bytes
 8 files changed, 828 insertions(+), 59 deletions(-)
 create mode 100644 htdocs/admin/receiptprinter.php
 create mode 100644 htdocs/core/lib/receiptprinter.lib.php
 create mode 100644 htdocs/langs/en_US/receiptprinter.lang
 create mode 100644 htdocs/theme/common/dolibarr_logo_bw.png

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
new file mode 100644
index 00000000000..464f7895967
--- /dev/null
+++ b/htdocs/admin/receiptprinter.php
@@ -0,0 +1,404 @@
+<?php
+/* Copyright (C) 2013      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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/>.
+ */
+
+/**
+ *      \file       htdocs/admin/receiptprinter.php
+ *      \ingroup    printing
+ *      \brief      Page to setup receipt printer
+ */
+
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/receiptprinter.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+
+$langs->load("admin");
+$langs->load("receiptprinter");
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action','alpha');
+$mode = GETPOST('mode','alpha');
+$value = GETPOST('value','alpha');
+$varname = GETPOST('varname', 'alpha');
+$printername = GETPOST('printername', 'alpha');
+$printerid = GETPOST('printerid', 'int');
+$parameter = GETPOST('parameter', 'alpha');
+
+$printer = new dolReceiptPrinter($db);
+
+if (!$mode) $mode='config';
+
+if (!function_exists('gzdecode')) {
+    function gzdecode($data)
+    {
+        return gzinflate(substr($data,10,-8));
+    }
+}
+
+/*
+ * Action
+ */
+
+if ($action == 'addprinter' && $user->admin)
+{
+    $error=0;
+    $db->begin();
+    if (empty($printername)) {
+        $error++;
+        setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
+    }
+
+    if (empty($parameter)) {
+        setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
+    }
+
+    if (! $error)
+    {
+        $result= $printer->AddPrinter($printername, GETPOST('printertypeid', 'int'), $parameter);
+        if ($result > 0) $error++;
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("PrinterAdded",$printername), null);
+        }
+        else
+        {
+            $db->rollback();
+            dol_print_error($db);
+        }
+    }
+    $action = '';
+}
+
+if ($action == 'deleteprinter' && $user->admin)
+{
+    $error=0;
+    $db->begin();
+    if (empty($printerid)) {
+        $error++;
+        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        $result= $printer->DeletePrinter($printerid);
+        if ($result > 0) $error++;
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("PrinterDeleted",$printername), null);
+        }
+        else
+        {
+            $db->rollback();
+            dol_print_error($db);
+        }
+    }
+    $action = '';
+}
+
+if ($action == 'updateprinter' && $user->admin)
+{
+    $error=0;
+    $db->begin();
+    if (empty($printerid)) {
+        $error++;
+        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        $result= $printer->UpdatePrinter($printername, GETPOST('printertypeid', 'int'), $parameter, $printerid);
+        if ($result > 0) $error++;
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("PrinterUpdated",$printername), null);
+        }
+        else
+        {
+            $db->rollback();
+            dol_print_error($db);
+        }
+    }
+    $action = '';
+}
+
+if ($action == 'testprinter' && $user->admin)
+{
+    $error=0;
+    if (empty($printerid)) {
+        $error++;
+        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        // test
+        $ret = $printer->SendTestToPrinter($printerid);
+        if ($ret == 0)
+        {
+            setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
+        }
+        else
+        {
+            setEventMessages($printer->error, $printer->errors, 'errors');
+        }
+    }
+    $action = '';
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader('',$langs->trans("ReceiptPrinterSetup"));
+
+$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ReceiptPrinterSetup"),$linkback,'title_setup');
+
+$head = receiptprinteradmin_prepare_head($mode);
+
+if ($mode == 'config' && $user->admin)
+{
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    if ($action!='editprinter') {
+        print '<input type="hidden" name="action" value="addprinter">';
+    } else {
+        print '<input type="hidden" name="action" value="updateprinter">';
+    }
+
+    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
+
+    print $langs->trans("ReceiptPrinterDesc")."<br><br>\n";
+
+    print '<table class="noborder" width="100%">'."\n";
+    $var=true;
+    print '<tr class="liste_titre">';
+    print '<th>'.$langs->trans("Name").'</th>';
+    print '<th>'.$langs->trans("Type").'</th>';
+    print '<th>'.$langs->trans("Parameters").'</th>';
+    print '<th></th>';
+    print '<th></th>';
+    print '<th></th>';
+    print "</tr>\n";
+    $ret = $printer->listprinters();
+    if ($ret > 0) {
+        setEventMessages($printer->error, $printer->errors, 'errors');
+    } else {
+        for ($line=0; $line < count($printer->listprinters); $line++) {
+            $var = !$var;
+            print '<tr '.$bc[$var].'>';
+            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>';
+                $ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
+                print '<td>'.$printer->resprint.'</td>';
+                print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
+                print '<td></td>';
+                print '<td></td>';
+                print '<td></td>';
+                print '</tr>';
+             } else {
+                print '<td>'.$printer->listprinters[$line]['name'].'</td>';
+                switch ($printer->listprinters[$line]['fk_type']) {
+                    case 1:
+                        $connector = 'CONNECTOR_DUMMY';
+                        break;
+                    case 2:
+                        $connector = 'CONNECTOR_FILE_PRINT';
+                        break;
+                    case 3:
+                        $connector = 'CONNECTOR_NETWORK_PRINT';
+                        break;
+                    case 4:
+                        $connector = 'CONNECTOR_WINDOWS_PRINT';
+                        break;
+                    default:
+                        $connector = 'CONNECTOR_UNKNOWN';
+                        break;
+                }
+                print '<td>'.$langs->trans($connector).'</td>';
+                print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
+                // edit icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+                print img_picto($langs->trans("Edit"),'edit');
+                print '</a></td>';
+                // delete icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=deleteprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print img_picto($langs->trans("Delete"),'delete');
+                print '</a></td>';
+                // test icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=testprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print img_picto($langs->trans("TestPrinter"),'printer');
+                print '</a></td>';
+                print '</tr>';
+            }
+        }
+    }
+
+    if ($action!='editprinter') {
+        print '<tr class="liste_titre">';
+        print '<th>'.$langs->trans("Name").'</th>';
+        print '<th>'.$langs->trans("Type").'</th>';
+        print '<th>'.$langs->trans("Parameters").'</th>';
+        print '<th></th>';
+        print '<th></th>';
+        print '<th></th>';
+        print "</tr>\n";
+        print '<tr>';
+        print '<td><input size="50" type="text" name="printername"></td>';
+        $ret = $printer->selectTypePrinter();
+        print '<td>'.$printer->resprint.'</td>';
+        print '<td><input size="60" type="text" name="parameter"></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '<td></td>';
+        print '</tr>';
+    }
+    print '</table>';
+
+    dol_fiche_end();
+    if ($action!='editprinter') {
+        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
+    } else {
+        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+    }
+    print '</form>';
+
+}
+
+if ($mode == 'template' && $user->admin)
+{
+     $tags = array(
+        'dol_align_left',
+        'dol_align_center',
+        'dol_align_right',
+        'dol_use_font_a',
+        'dol_use_font_b',
+        'dol_use_font_c',
+        'dol_bold',
+        '/dol_bold',
+        'dol_double_height',
+        '/dol_double_height',
+        'dol_double_width',
+        '/dol_double_width',
+        'dol_underline',
+        '/dol_underline',
+        'dol_underline_2dots',
+        '/dol_underline',
+        'dol_emphasized',
+        '/dol_emphasized',
+        'dol_switch_colors',
+        '/dol_switch_colors',
+        'dol_print_barcode',
+        'dol_print_barcode_customer_id',
+        'dol_set_print_width_57',
+        'dol_cut_paper_full',
+        'dol_cut_paper_partial',
+        'dol_open_drawer',
+        'dol_activate_buzzer',
+        'dol_print_qrcode',
+        'dol_print_date',
+        'dol_print_date_time',
+        'dol_print_year',
+        'dol_print_month_letters',
+        'dol_print_month',
+        'dol_print_day',
+        'dol_print_day_letters',
+        'dol_print_table',
+        'dol_print_cutlery',
+        'dol_print_payment',
+        'dol_print_logo',
+        'dol_print_logo_old',
+        'dol_print_order_lines',
+        'dol_print_order_tax',
+        'dol_print_order_local_tax',
+        'dol_print_order_total',
+        'dol_print_order_number',
+        'dol_print_order_number_unique',
+        'dol_print_customer_first_name',
+        'dol_print_customer_last_name',
+        'dol_print_customer_mail',
+        'dol_print_customer_telephone',
+        'dol_print_customer_mobile',
+        'dol_print_customer_skype',
+        'dol_print_customer_tax_number',
+        'dol_print_customer_account_balance',
+        'dol_print_vendor_last_name',
+        'dol_print_vendor_first_name',
+        'dol_print_vendor_mail',
+        'dol_print_customer_points',
+        'dol_print_order_points',
+        'dol_print_if_customer',
+        'dol_print_if_vendor',
+        'dol_print_if_happy_hour',
+        'dol_print_if_num_order_unique',
+        'dol_print_if_customer_points',
+        'dol_print_if_order_points',
+        'dol_print_if_customer_tax_number',
+        'dol_print_if_customer_account_balance_positive',
+    );
+
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="addtemplate">';
+
+    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
+
+    print $langs->trans("ReceiptPrinterTemplateDesc")."<br><br>\n";
+    print '<table class="noborder" width="100%">'."\n";
+    $var=true;
+    print '<tr class="liste_titre">';
+    print '<th>'.$langs->trans("Template").'</th>';
+    print '<th></th>';
+    print "</tr>\n";
+    print '</table>';
+    print '</form>';
+    print '<table class="noborder" width="100%">'."\n";
+    $var=true;
+    print '<tr class="liste_titre">';
+    print '<th>'.$langs->trans("Tag").'</th>';
+    print '<th>'.$langs->trans("Description").'</th>';
+    print "</tr>\n";
+    for ($tag=0; $tag < count($tags); $tag++) {
+        $var = !$var;
+        print '<tr '.$bc[$var].'>';
+        print '<td>&lt;'.$tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($tags[$tag])).'</td>';
+        print '</tr>';
+    }
+    print '</table>';
+    dol_fiche_end();
+
+}
+
+
+llxFooter();
+
+$db->close();
+
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 74560e8ff6a..a7c1b419012 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -58,6 +58,7 @@ if (GETPOST('action','alpha') == 'set')
 	$res = dolibarr_set_const($db,"CASHDESK_ID_WAREHOUSE",(GETPOST('CASHDESK_ID_WAREHOUSE','alpha') > 0 ? GETPOST('CASHDESK_ID_WAREHOUSE','alpha') : ''),'chaine',0,'',$conf->entity);
 	$res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",GETPOST('CASHDESK_NO_DECREASE_STOCK','alpha'),'chaine',0,'',$conf->entity);
 	$res = dolibarr_set_const($db,"CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES','alpha'),'chaine',0,'',$conf->entity);
+	$res = dolibarr_set_const($db,"CASHDESK_DOLIBAR_RECEIPT_PRINTER", GETPOST('CASHDESK_DOLIBAR_RECEIPT_PRINTER','alpha'),'chaine',0,'',$conf->entity);
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha'));
 
@@ -169,6 +170,17 @@ if (! empty($conf->service->enabled))
     print "</td></tr>\n";
 }
 
+// Use Dolibarr Receipt Printer
+if (! empty($conf->receiptprinter->enabled))
+{
+    $var=! $var;
+    print '<tr '.$bc[$var].'><td>';
+    print $langs->trans("DolibarrReceiptPrinter");
+    print '<td colspan="2">';
+    print $form->selectyesno("CASHDESK_DOLIBAR_RECEIPT_PRINTER",$conf->global->CASHDESK_DOLIBAR_RECEIPT_PRINTER,1);
+    print "</td></tr>\n";
+}
+
 print '</table>';
 print '<br>';
 
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 683efdd1dde..7a9c1be888a 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -19,78 +19,92 @@
 
 /**
  *  \file           htdocs/core/class/dolreceiptprinter.class.php
- *  \brief          Print receipt ticket on various printer
+ *  \brief          Print receipt ticket on various ESC/POS printer
  */
 
 /*
- * codes for ticket template
+ * Tags for ticket template
  *
- * <align_left>                                    Left align text
- * <align_center>                                  Center text
- * <align_right>                                   Right align text
- * <use_font_a>                                    Use font A of printer
- * <use_font_b>                                    Use font B of printer
- * <use_font_c>                                    Use font C of printer
- * <bold> </bold>                                  Text Bold
- * <double_height> </double_height>                Text double height
- * <double_width> </double_width>                  Text double width
- * <underline> </underline>                        Underline text
- * <underline_2dots> </underline>                  Underline with double line
- * <emphasized> </emphasized>                      Emphasized text
- * <switch_colors> </switch_colors>                Print in white on black
- * <print_barcode>                                 Print barcode
- * <print_barcode_customer_id>                     Print barcode customer id
- * <set_print_width_57>                            Ticket print width of 57mm
- * <cut_paper_full>                                Cut ticket completely
- * <cut_paper_partial>                             Cut ticket partially
- * <open_drawer>                                   Open cash drawer
- * <activate_buzzer>                               Activate buzzer
+ * <dol_align_left>                                 Left align text
+ * <dol_align_center>                               Center text
+ * <dol_align_right>                                Right align text
+ * <dol_use_font_a>                                 Use font A of printer
+ * <dol_use_font_b>                                 Use font B of printer
+ * <dol_use_font_c>                                 Use font C of printer
+ * <dol_bold> </dol_bold>                           Text Bold
+ * <dol_double_height> </dol_double_height>         Text double height
+ * <dol_double_width> </dol_double_width>           Text double width
+ * <dol_underline> </dol_underline>                 Underline text
+ * <dol_underline_2dots> </dol_underline_2dots>     Underline with double line
+ * <dol_emphasized> </dol_emphasized>               Emphasized text
+ * <dol_switch_colors> </dol_switch_colors>         Print in white on black
+ * <dol_print_barcode>                              Print barcode
+ * <dol_print_barcode_customer_id>                  Print barcode customer id
+ * <dol_set_print_width_57>                         Ticket print width of 57mm
+ * <dol_cut_paper_full>                             Cut ticket completely
+ * <dol_cut_paper_partial>                          Cut ticket partially
+ * <dol_open_drawer>                                Open cash drawer
+ * <dol_activate_buzzer>                            Activate buzzer
  * 
  * Code which can be placed everywhere
- * <print_qrcode>                                  Print QR Code
- * <print_date>                                    Print date (format : AAAA-MM-DD)
- * <print_date_time>                               Print date and time (format AAAA-MM-DD HH:MM:SS)
- * <print_year>                                    Print Year
- * <print_month_letters>                           Print month in letters (example : november)
- * <print_month>                                   Print month number
- * <print_day>                                     Print day number
- * <print_table>                                   Print table number
- * <print_cutlery>                                 Print cutlery number
- * <print_payment>                                 Print payment method
- * <print_logo>                                    Print logo stored on printer. Example : <print_logo>32|32
- * <print_logo_deprecated>                         Print logo stored on printer. Must be followed by logo code. For old printers.
- * <print_num_order>                               Print order number
- * <print_num_order_unique>                        Print order number after validation
- * <print_customer_first_name>                     Print customer firstname
- * <print_customer_last_name>                      Print customer name
- * <print_customer_mail>                           Print customer mail
- * <print_customer_telephone>                      Print customer phone
- * <print_customer_mobile>                         Print customer mobile
- * <print_customer_skype>                          Print customer skype
- * <print_customer_tax_number>                     Print customer VAT number
- * <print_customer_account_balance>                Print customer account balance
- * <print_vendor_last_name>                        Print vendor name
- * <print_vendor_first_name>                       Print vendor firstname
- * <print_customer_points>                         Print customer points
- * <print_order_points>                            Print number of points for this order
+ * <dol_print_qrcode>                               Print QR Code
+ * <dol_print_date>                                 Print date AAAA-MM-DD
+ * <dol_print_date_time>                            Print date and time AAAA-MM-DD HH:MM:SS
+ * <dol_print_year>                                 Print Year
+ * <dol_print_month_letters>                        Print month in letters (example : november)
+ * <dol_print_month>                                Print month number
+ * <dol_print_day>                                  Print day number
+ * <dol_print_day_letters>                          Print day number
+ * <dol_print_table>                                Print table number (for restaurant, bar...)
+ * <dol_print_cutlery>                              Print number of cutlery (for restaurant)
+ * <dol_print_payment>                              Print payment method
+ * <dol_print_logo>                                 Print logo stored on printer. Example : <print_logo>32|32
+ * <dol_print_logo_old>                             Print logo stored on printer. Must be followed by logo code. For old printers.
+ * <dol_print_order_lines>                          Print order lines
+ * <dol_print_order_tax>                            Print order total tax
+ * <dol_print_order_local_tax>                      Print order local tax
+ * <dol_print_order_total>                          Print order total
+ * <dol_print_order_number>                         Print order number
+ * <dol_print_order_number_unique>                  Print order number after validation
+ * <dol_print_customer_first_name>                  Print customer firstname
+ * <dol_print_customer_last_name>                   Print customer name
+ * <dol_print_customer_mail>                        Print customer mail
+ * <dol_print_customer_telephone>                   Print customer phone
+ * <dol_print_customer_mobile>                      Print customer mobile
+ * <dol_print_customer_skype>                       Print customer skype
+ * <dol_print_customer_tax_number>                  Print customer VAT number
+ * <dol_print_customer_account_balance>             Print customer account balance
+ * <dol_print_vendor_last_name>                     Print vendor name
+ * <dol_print_vendor_first_name>                    Print vendor firstname
+ * <dol_print_vendor_mail>                          Print vendor mail
+ * <dol_print_customer_points>                      Print customer points
+ * <dol_print_order_points>                         Print number of points for this order
  *
  * Conditional code at line start (if�then Print)
- * <print_if_customer>                             Print the line IF a customer is affected to the order
- * <print_if_vendor>                               Print the line IF a vendor is affected to the order
- * <print_if_happy_hour>                           Print the line IF Happy Hour
- * <print_if_num_order_unique>                     Print the line IF order is validated
- * <print_if_customer_points>                      Print the line IF customer points > 0
- * <print_if_order_points>                         Print the line IF points of the order > 0
- * <print_if_customer_tax_number>                  Print the line IF customer has vat number
- * <print_if_customer_account_balance_positive>    Print the line IF customer balance > 0
+ * <dol_print_if_customer>                          Print the line IF a customer is affected to the order
+ * <dol_print_if_vendor>                            Print the line IF a vendor is affected to the order
+ * <dol_print_if_happy_hour>                        Print the line IF Happy Hour
+ * <dol_print_if_num_order_unique>                  Print the line IF order is validated
+ * <dol_print_if_customer_points>                   Print the line IF customer points > 0
+ * <dol_print_if_order_points>                      Print the line IF points of the order > 0
+ * <dol_print_if_customer_tax_number>               Print the line IF customer has vat number
+ * <dol_print_if_customer_account_balance_positive> Print the line IF customer balance > 0
  *
  */
 
+require_once DOL_DOCUMENT_ROOT .'/includes/escpos/Escpos.php';
+
+ 
 /**
  * Class to manage Receipt Printers
  */
-class dolReceiptPrinter
+class dolReceiptPrinter extends Escpos
 {
+    const CONNECTOR_DUMMY = 1;
+    const CONNECTOR_FILE_PRINT = 2;
+    const CONNECTOR_NETWORK_PRINT = 3;
+    const CONNECTOR_WINDOWS_PRINT = 4;
+    //const CONNECTOR_JAVA = 6;
     var $db;
     var $error;
     var $errors;
@@ -107,5 +121,191 @@ class dolReceiptPrinter
         $this->db=$db;
     }
 
+    /**
+     * Constructor
+     *
+     * @return  int                     0 if OK; >0 if KO
+     */
+    function listPrinters()
+    {
+        global $conf;
+        $error = 0;
+        $line = 0;
+        $sql = 'SELECT rowid, name, fk_type, parameter';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' WHERE entity = '.$conf->entity;
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+            while ($line < $num) {
+                $obj[] = $this->db->fetch_array($resql);
+                $line++;
+            }
+        } else {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        $this->listprinters = $obj;
+        return $error;
+    }
+
+
+    /**
+     *  Form to Select type printer
+     *
+     *  @param    string    $selected       Id printer type pre-selected
+     *  @param    string    $htmlname       select html name
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function selectTypePrinter($selected='', $htmlname='printertypeid')
+    {
+        global $langs;
+        $error = 0;
+        $html = '<select class="flat" name="'.$htmlname.'">';
+        $html.= '<option value="1" '.($selected==1?'selected="selected"':'').'>'.$langs->trans('CONNECTOR_DUMMY').'</option>';
+        $html.= '<option value="2" '.($selected==2?'selected="selected"':'').'>'.$langs->trans('CONNECTOR_FILE_PRINT').'</option>';
+        $html.= '<option value="3" '.($selected==3?'selected="selected"':'').'>'.$langs->trans('CONNECTOR_NETWORK_PRINT').'</option>';
+        $html.= '<option value="4" '.($selected==4?'selected="selected"':'').'>'.$langs->trans('CONNECTOR_WINDOWS_PRINT').'</option>';
+        //$html.= '<option value="5" '.($selected==5?'selected="selected"':'').'>'.$langs->trans('CONNECTOR_JAVA').'</option>';
+        $html.= '</select>';
+
+        $this->resprint = $html;
+        return $error;
+    }
+
+    /**
+     *  Function to Add a printer in db
+     *
+     *  @param    string    $name           Printer name
+     *  @param    int       $type           Printer type
+     *  @param    string    $parameter      Printer parameter
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function AddPrinter($name, $type, $parameter)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' (name, fk_type, parameter, entity)';
+        $sql.= ' VALUES ("'.$name.'", '.$type.', "'.$parameter.'", '.$conf->entity.')';
+        $resql = $this->db->query($sql);
+        if (! $resql) {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        return $error;
+    }
+
+    /**
+     *  Function to Update a printer in db
+     *
+     *  @param    string    $name           Printer name
+     *  @param    int       $type           Printer type
+     *  @param    string    $parameter      Printer parameter
+     *  @param    int       $printerid      Printer id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function UpdatePrinter($name, $type, $parameter, $printerid)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' SET name="'.$name.'"';
+        $sql.= ', fk_type='.$type;
+        $sql.= ', parameter="'.$parameter.'"';
+        $sql.= ' WHERE rowid='.$printerid;
+        $resql = $this->db->query($sql);
+        if (! $resql) {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        return $error;
+    }
+
+    /**
+     *  Function to Delete a printer from db
+     *
+     *  @param    int       $printerid      Printer id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function DeletePrinter($printerid)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' WHERE rowid='.$printerid;
+        $resql = $this->db->query($sql);
+        if (! $resql) {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        return $error;
+    }
+
+    /**
+     *  Function to Send Test �ge to Printer
+     *
+     *  @param    int       $printerid      Printer id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function SendTestToPrinter($printerid)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'SELECT rowid, name, fk_type, parameter';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' WHERE rowid = '.$printerid;
+        $sql.= ' AND entity = '.$conf->entity;
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $obj = $this->db->fetch_array($resql);
+        } else {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        //print '<pre>'.print_r($obj, true).'</pre>';
+        if (! $error) {
+            $parameter = $obj['parameter'];
+            try {
+                switch ($obj['fk_type']) {
+                    case 1:
+                        require_once DOL_DOCUMENT_ROOT .'/includes/escpos/src/DummyPrintConnector.php';
+                        $connector = new DummyPrintConnector();
+                        break;
+                    case 2:
+                        $connector = new FilePrintConnector($parameter);
+                        break;
+                    case 3:
+                        $parameters = explode(':', $parameter);
+                        $connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+                        break;
+                    case 4:
+                        $connector = new WindowsPrintConnector($parameter);
+                        break;
+                    default:
+                        $connector = 'CONNECTOR_UNKNOWN';
+                        break;
+                }
+                $testprinter = new Escpos($connector);
+                $img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
+                $testprinter -> graphics($img);
+                $testprinter -> text("Hello World!\n");
+                $testStr = "Testing 123";
+                $testprinter -> qrCode($testStr);
+                $testprinter -> text("Most simple example\n");
+                $testprinter -> feed();
+                $testprinter -> cut();
+                //print '<pre>'.print_r($connector, true).'</pre>';
+                $testprinter -> close();
+
+                //print '<pre>'.print_r($connector, true).'</pre>';
+                //print '<pre>'.print_r($testprinter, true).'</pre>';
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+                $error++;
+            }
+        }
+        return $error;
+    }
 
 }
diff --git a/htdocs/core/lib/receiptprinter.lib.php b/htdocs/core/lib/receiptprinter.lib.php
new file mode 100644
index 00000000000..d440acc5403
--- /dev/null
+++ b/htdocs/core/lib/receiptprinter.lib.php
@@ -0,0 +1,72 @@
+<?php
+/* Copyright (C) 2015      Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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/>.
+ */
+
+/**
+ *  \file           htdocs/core/lib/receiptprinter.lib.php
+ *  \ingroup        printing
+ *  \brief          Library for receipt printer functions
+ */
+
+
+
+/**
+ *  Define head array for tabs of receipt printer setup pages
+ *
+ *  @param  string  $mode       Mode
+ *  @return                     Array of head
+ */
+function receiptprinteradmin_prepare_head($mode)
+{
+    global $langs, $conf;
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=config";
+    $head[$h][1] = $langs->trans("ListPrinters");
+    $head[$h][2] = 'config';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=template";
+    $head[$h][1] = $langs->trans("SetupReceiptTemplate");
+    $head[$h][2] = 'template';
+    $h++;
+
+    if ($mode == 'test')
+    {
+        $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=test";
+        $head[$h][1] = $langs->trans("TargetedPrinter");
+        $head[$h][2] = 'test';
+        $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,'printingadmin');
+
+    //complete_head_from_modules($conf,$langs,$object,$head,$h,'printing','remove');
+
+    return $head;
+}
+
+
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 033303fdcd9..a4cf99373fa 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -50,7 +50,7 @@ class modReceiptPrinter 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 = "Receipt Printer.";
+        $this->description = "ReceiptPrinterDesc";
         $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
         $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)
@@ -70,7 +70,7 @@ class modReceiptPrinter extends DolibarrModules
         $this->depends = array();
         $this->requiredby = array();
         $this->phpmin = array(5,1);                     // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(3,7,-2);   // Minimum version of Dolibarr required by module
+        $this->need_dolibarr_version = array(3,9,-2);   // Minimum version of Dolibarr required by module
         $this->conflictwith = array();
         $this->langfiles = array("receiptprinter");
 
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index d3dcfb68e64..f3b5f77f296 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -38,3 +38,4 @@ ShowStock=Show warehouse
 DeleteArticle=Click to remove this article
 FilterRefOrLabelOrBC=Search (Ref/Label)
 UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+DolibarrReceiptPrinter=Dolibarr Receipt Printer
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
new file mode 100644
index 00000000000..d95b1631b40
--- /dev/null
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -0,0 +1,80 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+PrinterAdded=Printer %s added
+PrinterUpdated=Printer %s updated
+PrinterDeleted=Printer %s deleted
+TestSentToPrinter=Test Sent To Printer %s
+CONNECTOR_DUMMY=Dummy Printer
+CONNECTOR_NETWORK_PRINT=Network Printer
+CONNECTOR_FILE_PRINT=Local Printer
+CONNECTOR_WINDOWS_PRINT=Local Windows Printer
+CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+DOL_ALIGN_LEFT=Left align text
+DOL_ALIGN_CENTER=Center text
+DOL_ALIGN_RIGHT=Right align text
+DOL_USE_FONT_A=Use font A of printer
+DOL_USE_FONT_B=Use font B of printer
+DOL_USE_FONT_C=Use font C of printer
+DOL_BOLD=Text Bold
+/DOL_BOLD=End of Text Bold
+DOL_DOUBLE_HEIGHT=Text double height
+/DOL_DOUBLE_HEIGHT=End of Text double height
+DOL_DOUBLE_WIDTH=Text double width
+/DOL_DOUBLE_WIDTH=End of Text double width
+DOL_UNDERLINE=Underline text
+/DOL_UNDERLINE=End of Underline text
+DOL_UNDERLINE_2DOTS=Underline with double line
+/DOL_UNDERLINE_2DOTS=End of Underline with double line
+DOL_EMPHASIZED=Emphasized text
+/DOL_EMPHASIZED=End of Emphasized text
+DOL_SWITCH_COLORS=Print in white on black
+/DOL_SWITCH_COLORS=End of Print in white on black
+DOL_PRINT_BARCODE=Print barcode
+DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_SET_PRINT_WIDTH_57=Ticket print width of 57mm
+DOL_CUT_PAPER_FULL=Cut ticket completely
+DOL_CUT_PAPER_PARTIAL=Cut ticket partially
+DOL_OPEN_DRAWER=Open cash drawer
+DOL_ACTIVATE_BUZZER=Activate buzzer
+DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_DATE=Print date AAAA-MM-DD
+DOL_PRINT_DATE_TIME=Print date and time AAAA-MM-DD HH:MM:SS
+DOL_PRINT_YEAR=Print Year
+DOL_PRINT_MONTH_LETTERS=Print month in letters (example : november)
+DOL_PRINT_MONTH=Print month number
+DOL_PRINT_DAY=Print day number
+DOL_PRINT_DAY_LETTERS=Print day number
+DOL_PRINT_TABLE=Print table number (for restaurant, bar...)
+DOL_PRINT_CUTLERY=Print number of cutlery (for restaurant)
+DOL_PRINT_PAYMENT=Print payment method
+DOL_PRINT_LOGO=Print logo stored on printer. Example : 32|32
+DOL_PRINT_LOGO_OLD=Print logo stored on printer. Must be followed by logo code. For old printers.
+DOL_PRINT_ORDER_LINES=Print order lines
+DOL_PRINT_ORDER_TAX=Print order total tax
+DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax
+DOL_PRINT_ORDER_TOTAL=Print order total
+DOL_PRINT_ORDER_NUMBER=Print order number
+DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation
+DOL_PRINT_CUSTOMER_FIRST_NAME=Print customer firstname
+DOL_PRINT_CUSTOMER_LAST_NAME=Print customer name
+DOL_PRINT_CUSTOMER_MAIL=Print customer mail
+DOL_PRINT_CUSTOMER_TELEPHONE=Print customer phone
+DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile
+DOL_PRINT_CUSTOMER_SKYPE=Print customer skype
+DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number
+DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance
+DOL_PRINT_VENDOR_LAST_NAME=Print vendor name
+DOL_PRINT_VENDOR_FIRST_NAME=Print vendor firstname
+DOL_PRINT_VENDOR_MAIL=Print vendor mail
+DOL_PRINT_CUSTOMER_POINTS=Print customer points
+DOL_PRINT_ORDER_POINTS=Print number of points for this order
+DOL_PRINT_IF_CUSTOMER=Print the line IF a customer is affected to the order
+DOL_PRINT_IF_VENDOR=Print the line IF a vendor is affected to the order
+DOL_PRINT_IF_HAPPY_HOUR=Print the line IF Happy Hour
+DOL_PRINT_IF_NUM_ORDER_UNIQUE=Print the line IF order is validated
+DOL_PRINT_IF_CUSTOMER_POINTS=Print the line IF customer points > 0
+DOL_PRINT_IF_ORDER_POINTS=Print the line IF points of the order > 0
+DOL_PRINT_IF_CUSTOMER_TAX_NUMBER=Print the line IF customer has vat number
+DOL_PRINT_IF_CUSTOMER_ACCOUNT_BALANCE_POSITIVE=Print the line IF customer balance > 0
diff --git a/htdocs/theme/common/dolibarr_logo_bw.png b/htdocs/theme/common/dolibarr_logo_bw.png
new file mode 100644
index 0000000000000000000000000000000000000000..238a1899c00d9e74878a57a3efa53a1209315a24
GIT binary patch
literal 791
zcmV+y1L*vTP)<h;3K|Lk000e1NJLTq008g+002G$0{{R3XxV<n00009P)t-sxp7(m
z00960|A0lF;{X5v0d!JMQvg8b*k%9#00Cl4M??UK1szBL000SaNLh0L01FcU01FcV
z0GgZ_00007bV*G`2j2?<7Y__&A{fyC00M_eL_t(Y$L-fKvfCgK0MOlxagmBb6!8&q
z3N(`g;2HMM<o9WGisS|^k{f&%U#H9hiv&iJ<?kX*C@jY2t$<x@8DM`yvSf`z@JOJ+
z!Xr&lPtJH$gycGKk6}RQw88`S&~><pm0iFGjo1NWzm3T+-Wd-%T(>b2wb(kXB6erg
z0EW2v#`*AKfyxMB!>sWElRY2!&P1(_ShX0i=TrrZB__8IgVVfcykYkIZN{{O-6Gau
zw;i_`+kLoW9P+Fy>~>6>`Y>nB6$V{}{eH}~%~uUGru(T{sH25NM-0L3#qJgx{{)s#
zcVYhwPNS&7Do+Wg@RVO_oGw+Wj4Y^(Xv2X@d3Nb&#Z1PvR~2StP9|q0Mnw{A)BWY*
zTkO(}<<=$)RRvZg;o=N#v6o3rOS51Kj3nW5kP4H`x)@3gHj?lL+q|)PD3%y<IFhnn
z!A@4#V7HE)Y)7oxAXI}fC%nO4w&OWWf=z|P*5?7X!6bY6G^Q3)f!zkSYdF?YgF7YI
zt2;QJks7C}$f>ktbv9Tv7zEo1%i*ZXb2=_-*n9w+gkcS<XRz6U*QSkm|J?`HOt}yi
zQf0SsFO{bjizJ?xDewxOPfmfSl8$F<54MkEcNfzZUidPYzChF>{=xXlZ@kzK;9(s5
zk=uLfb9(~}FFgE`<8kK?U%nLhrNnRCKb816j+f92jRy`h{$Ao=;q%LcFA0B+?+p{?
z$(=%P2$PJx8HfH+Mi%&#mvpM|*9u?bPq2*qG~;7l(lOzmOZXChgNHP-z%ianf!FXg
z{pKIj$O6M_nsu0Wi#cQcI6Z{Dj=!tN3hoc1JXQ?vO`dNb)7!rq`GH1x_}~6v`wK+|
Vh4s`po4Wu2002ovPDHLkV1gedW?BFM

literal 0
HcmV?d00001


From 5c725aceb8c950e543480e09a6257ad999f2be49 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Tue, 3 Nov 2015 21:40:05 +0100
Subject: [PATCH 116/216] sql

---
 htdocs/admin/receiptprinter.php               |  3 +++
 htdocs/core/class/dolreceiptprinter.class.php |  2 +-
 .../core/modules/modReceiptPrinter.class.php  | 24 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 464f7895967..9e06b327f09 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -239,6 +239,9 @@ if ($mode == 'config' && $user->admin)
                     case 4:
                         $connector = 'CONNECTOR_WINDOWS_PRINT';
                         break;
+                    case 5:
+                        $connector = 'CONNECTOR_JAVA';
+                        break;
                     default:
                         $connector = 'CONNECTOR_UNKNOWN';
                         break;
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 7a9c1be888a..3de7be512af 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -104,7 +104,7 @@ class dolReceiptPrinter extends Escpos
     const CONNECTOR_FILE_PRINT = 2;
     const CONNECTOR_NETWORK_PRINT = 3;
     const CONNECTOR_WINDOWS_PRINT = 4;
-    //const CONNECTOR_JAVA = 6;
+    //const CONNECTOR_JAVA = 5;
     var $db;
     var $error;
     var $errors;
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index a4cf99373fa..375ab653d3c 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -93,7 +93,7 @@ class modReceiptPrinter extends DolibarrModules
         // $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
         $r++;
-        $this->rights[$r][0] = 67001;
+        $this->rights[$r][0] = 67000;
         $this->rights[$r][1] = 'ReceiptPrinter';
         $this->rights[$r][2] = 'r';
         $this->rights[$r][3] = 1;
@@ -120,4 +120,26 @@ class modReceiptPrinter extends DolibarrModules
 
 
     }
+
+
+    /**
+     *      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='')
+    {
+        global $conf;
+        // Clean before activation
+        $this->remove($options);
+        $sql = array(
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), fk_type int(11), parameter varchar(128), entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            "CREATE TABLE IF NOT EXISTS llx_printer_receipt_template (rowid int(11) NOT NULL AUTO_INCREMENT, name varchar(128), template text, entity int(11), PRIMARY KEY (rowid)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;",
+            );
+        return $this->_init($sql,$options);
+    }
+
 }

From 4a67a947042a546aee9cd22200fda1234fab5250 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Tue, 3 Nov 2015 23:11:04 +0100
Subject: [PATCH 117/216] wip template edit

---
 htdocs/admin/receiptprinter.php               | 60 +++++++++++++++++--
 htdocs/core/class/dolreceiptprinter.class.php | 54 ++++++++++++++++-
 2 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 9e06b327f09..732bd06952d 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -249,15 +249,15 @@ if ($mode == 'config' && $user->admin)
                 print '<td>'.$langs->trans($connector).'</td>';
                 print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
                 // edit icon
-                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
                 print img_picto($langs->trans("Edit"),'edit');
                 print '</a></td>';
                 // delete icon
-                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=deleteprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
                 print img_picto($langs->trans("Delete"),'delete');
                 print '</a></td>';
                 // test icon
-                print '<td><a href="'.$_SERVER['PHP_SELF'].'?action=testprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
                 print img_picto($langs->trans("TestPrinter"),'printer');
                 print '</a></td>';
                 print '</tr>';
@@ -368,9 +368,13 @@ if ($mode == 'template' && $user->admin)
         'dol_print_if_customer_account_balance_positive',
     );
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-    print '<input type="hidden" name="action" value="addtemplate">';
+    if ($action!='edittemplate') {
+        print '<input type="hidden" name="action" value="addtemplate">';
+    } else {
+        print '<input type="hidden" name="action" value="updatetemplate">';
+    }
 
     dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), 0, 'technic');
 
@@ -378,11 +382,56 @@ if ($mode == 'template' && $user->admin)
     print '<table class="noborder" width="100%">'."\n";
     $var=true;
     print '<tr class="liste_titre">';
+    print '<th>'.$langs->trans("Name").'</th>';
     print '<th>'.$langs->trans("Template").'</th>';
     print '<th></th>';
+    print '<th></th>';
+    print '<th></th>';
     print "</tr>\n";
+    $ret = $printer->listPrintersTemplates();
+    //print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
+    if ($ret > 0) {
+        setEventMessages($printer->error, $printer->errors, 'errors');
+    } else {
+        for ($line=0; $line < count($printer->listprinterstemplates); $line++) {
+            $var = !$var;
+            print '<tr '.$bc[$var].'>';
+            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>';
+                // TODO doleditor
+                print '<td><input size="120" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['template'].'"></td>';
+                print '<td></td>';
+                print '<td></td>';
+                print '<td></td>';
+            } else {
+                print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
+                print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
+                // edit icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
+                print img_picto($langs->trans("Edit"),'edit');
+                print '</a></td>';
+                // delete icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print img_picto($langs->trans("Delete"),'delete');
+                print '</a></td>';
+                // test icon
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print img_picto($langs->trans("TestPrinterTemplate"),'printer');
+                print '</a></td>';
+            }
+            print '</tr>';
+        }
+    }
+
     print '</table>';
+    if ($action!='edittemplate') {
+        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
+    } else {
+        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+    }
     print '</form>';
+    print '<div><p></div>';
     print '<table class="noborder" width="100%">'."\n";
     $var=true;
     print '<tr class="liste_titre">';
@@ -396,6 +445,7 @@ if ($mode == 'template' && $user->admin)
         print '</tr>';
     }
     print '</table>';
+
     dol_fiche_end();
 
 }
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 3de7be512af..57f8691f6e7 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -122,7 +122,7 @@ class dolReceiptPrinter extends Escpos
     }
 
     /**
-     * Constructor
+     * list printers
      *
      * @return  int                     0 if OK; >0 if KO
      */
@@ -150,6 +150,35 @@ class dolReceiptPrinter extends Escpos
     }
 
 
+    /**
+     * List printers templates
+     *
+     * @return  int                     0 if OK; >0 if KO
+     */
+    function listPrintersTemplates()
+    {
+        global $conf;
+        $error = 0;
+        $line = 0;
+        $sql = 'SELECT rowid, name, template';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql.= ' WHERE entity = '.$conf->entity;
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+            while ($line < $num) {
+                $obj[] = $this->db->fetch_array($resql);
+                $line++;
+            }
+        } else {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        $this->listprinterstemplates = $obj;
+        return $error;
+    }
+
+
     /**
      *  Form to Select type printer
      *
@@ -243,7 +272,7 @@ class dolReceiptPrinter extends Escpos
     }
 
     /**
-     *  Function to Send Test �ge to Printer
+     *  Function to Send Test page to Printer
      *
      *  @param    int       $printerid      Printer id
      *  @return  int                        0 if OK; >0 if KO
@@ -308,4 +337,25 @@ class dolReceiptPrinter extends Escpos
         return $error;
     }
 
+    /**
+     *  Function to Print Receipt Ticket
+     *
+     *  @param   object    $object          order or invoice object
+     *  @param   int       $template        Template id
+     *  @param   int       $printerid       Printer id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function SendToPrinter($object, $template, $printerid)
+    {
+        global $conf;
+        $error = 0;
+
+        // parse template
+
+
+        // print ticket
+
+        return $error;
+    }
+
 }

From 614f9c8e9804f87edfa6815db935f2fe5e4f94cf Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Tue, 3 Nov 2015 23:26:07 +0100
Subject: [PATCH 118/216] wip

---
 htdocs/admin/receiptprinter.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 732bd06952d..adba566eabb 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -294,6 +294,17 @@ if ($mode == 'config' && $user->admin)
     }
     print '</form>';
 
+    print '<div><p></div>';
+    dol_fiche_head();
+    print '<table class="noborder" width="100%">'."\n";
+    $var=true;
+    print '<tr><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
+    print '<td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
+    print '<td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
+    print '<td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
+    //print '<td>'.$langs->trans("CONNECTOR_JAVA").':</td><td>'.$langs->trans("CONNECTOR_JAVA_HELP").'</td></tr>';
+    print '</table>';
+    dol_fiche_end();
 }
 
 if ($mode == 'template' && $user->admin)

From 826cc6db1be3ad672ff22763cc036f0e2a326f0a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 09:54:13 +0100
Subject: [PATCH 119/216] Repair old deprecated data

---
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 7 ++++++-
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index d1cf11ac4c3..2241c35f00d 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -793,4 +793,9 @@ DELETE FROM llx_c_regions WHERE code_region=420 and fk_pays=4;
 
 ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(62);
 
-ALTER TABLE llx_societe_remise_except MODIFY COLUMN description text NOT NULL;
\ No newline at end of file
+ALTER TABLE llx_societe_remise_except MODIFY COLUMN description text NOT NULL;
+
+-- Fix bad data
+update llx_opensurvey_sondage set format = 'D' where format = 'D+';
+update llx_opensurvey_sondage set format = 'A' where format = 'A+';
+
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 8b64acf2ce8..c3e6b5b091e 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -18,8 +18,13 @@
 -- -- 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);
 
+-- Fix bad data
+update llx_opensurvey_sondage set format = 'D' where format = 'D+';
+update llx_opensurvey_sondage set format = 'A' where format = 'A+';
 
 INSERT INTO llx_const (name, value, type, note, visible) values ('MAIN_DELAY_EXPENSEREPORTS_TO_PAY','31','chaine','Tolérance de retard avant alerte (en jours) sur les notes de frais impayées',0);
 
 ALTER TABLE llx_accounting_system MODIFY COLUMN pcg_version varchar(32);
 ALTER TABLE llx_accountingaccount MODIFY COLUMN fk_pcg_version varchar(32);
+
+

From 81f0b516b9dd8ad937a862c1e5d4e454dee732e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 11:08:46 +0100
Subject: [PATCH 120/216] Prepare module opensurvey for 'Form' type.

---
 .../install/mysql/migration/3.8.0-3.9.0.sql   | 29 ++++++++++++++++++-
 .../tables/llx_opensurvey_formquestions.sql   | 24 +++++++++++++++
 .../mysql/tables/llx_opensurvey_sondage.sql   |  6 ++--
 .../llx_opensurvey_user_formanswers.sql       | 22 ++++++++++++++
 .../tables/llx_opensurvey_user_studs.sql      |  2 +-
 5 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
 create mode 100644 htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index ddbf3c79f1f..eb062806dcf 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -250,4 +250,31 @@ CREATE TABLE llx_product_pricerules
     var_min_percent FLOAT NOT NULL -- Min price discount over general price
 );
 ALTER TABLE llx_product ADD COLUMN price_autogen TINYINT(1) DEFAULT 0;
-ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
\ No newline at end of file
+ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
+
+
+-- Delete deprecated fields
+ALTER TABLE llx_opensurvey_sondage DROP COLUMN survey_link_visible;
+ALTER TABLE llx_opensurvey_sondage DROP INDEX idx_id_sondage_admin;
+ALTER TABLE llx_opensurvey_sondage DROP COLUMN id_sondage_admin;
+ALTER TABLE llx_opensurvey_sondage DROP COLUMN canedit;
+ALTER TABLE llx_opensurvey_sondage DROP COLUMN origin;
+
+DROP TABLE llx_opensurvey_sujet_studs;
+
+
+
+CREATE TABLE llx_opensurvey_formquestions (
+	rowid INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	id_sondage VARCHAR(16),
+	question TEXT,
+    available_answers TEXT								-- List of available answers
+) ENGINE=InnoDB;
+
+CREATE TABLE llx_opensurvey_user_formanswers (
+    fk_user_survey INTEGER NOT NULL,
+    fk_question INTEGER NOT NULL,
+    reponses TEXT
+) ENGINE=InnoDB;
+
+
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql b/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
new file mode 100644
index 00000000000..cf6b89f1339
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
@@ -0,0 +1,24 @@
+-- ============================================================================
+-- 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_opensurvey_formquestions (
+	rowid INTEGER AUTO_INCREMENT NOT NULL PRIMARY KEY,
+	id_sondage VARCHAR(16),
+	question TEXT,
+    available_answers TEXT								-- List of available answers
+) ENGINE=InnoDB;
+
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index dca50aba6f7..16e8a624e72 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -24,10 +24,10 @@ CREATE TABLE llx_opensurvey_sondage (
 	fk_user_creat integer NOT NULL,
 	titre TEXT NOT NULL,
 	date_fin DATETIME NOT NULL,
-	format VARCHAR(2) NOT NULL,
+	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,
 	allow_comments tinyint NOT NULL DEFAULT 1,
 	allow_spy tinyint NOT NULL DEFAULT 1,
 	tms TIMESTAMP,
-	sujet TEXT
-) ENGINE=InnoDB;
\ No newline at end of file
+	sujet TEXT,									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
+) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
new file mode 100644
index 00000000000..8a771604181
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2015 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_opensurvey_user_formanswers (
+    fk_user_survey INTEGER NOT NULL,
+    fk_question INTEGER NOT NULL,
+    reponses TEXT
+) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
index 78d7fa69c4d..0e918d68a86 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
@@ -19,6 +19,6 @@ CREATE TABLE llx_opensurvey_user_studs (
     id_users INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
-    reponses VARCHAR(100) NOT NULL,
+    reponses VARCHAR(100) NOT NULL,		-- Not used for 'F' surveys
     tms timestamp
 ) ENGINE=InnoDB;

From 3726b127a13ae3dc2360cf1016c947105825563e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 14:31:03 +0100
Subject: [PATCH 121/216] Remove duplicated code or useless code

---
 htdocs/main.inc.php       | 9 ---------
 htdocs/user/hierarchy.php | 1 -
 2 files changed, 10 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0399c8f44e7..cbf2582860c 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -692,15 +692,6 @@ if (! defined('NOLOGIN'))
             $db->commit();
         }
         
-        if (! empty($user->conf->MAIN_LANDING_PAGE))    // Example: /index.php
-        {
-            $newpath=dol_buildpath($user->conf->MAIN_LANDING_PAGE, 1);
-            if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
-            {
-                header('Location: '.$newpath);
-                exit;
-            }
-        }
         if (! empty($conf->global->MAIN_LANDING_PAGE))    // Example: /index.php
         {
             $newpath=dol_buildpath($conf->global->MAIN_LANDING_PAGE, 1);
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 14b8ec4265b..8ac96a336f4 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -43,7 +43,6 @@ $sall=GETPOST('sall','alpha');
 $search_user=GETPOST('search_user','alpha');
 
 $userstatic=new User($db);
-$companystatic = new Societe($db);
 $search_statut=GETPOST('search_statut','int');
 
 if ($search_statut == '') $search_statut='1';

From 6a9342f5a39cf437c353cc037ea326c5d63d82cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 14:54:17 +0100
Subject: [PATCH 122/216] Move default application name into one place (as a
 constant)

---
 htdocs/filefunc.inc.php | 1 +
 htdocs/main.inc.php     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index b3cbd2b33c0..5a492940cf1 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -30,6 +30,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
+if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
 if (! defined('DOL_VERSION')) define('DOL_VERSION','3.9.0-beta');
 
 if (! defined('EURO')) define('EURO',chr(128));
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index cbf2582860c..8943ca95821 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1003,7 +1003,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
         if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="author" title="Dolibarr Development Team" href="http://www.dolibarr.org">'."\n";
 
         // Displays title
-        $appli='Dolibarr';
+        $appli=constant('DOL_APPLICATION_TITLE');
         if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
 
         if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>';
@@ -1443,7 +1443,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    //$form=new Form($db);
 
 	    // Define link to login card
-	    $appli='Dolibarr';
+        $appli=constant('DOL_APPLICATION_TITLE');
 	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 	    {
 	    	$appli=$conf->global->MAIN_APPLICATION_TITLE;
@@ -1677,7 +1677,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 		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='Dolibarr';
+        $appli=constant('DOL_APPLICATION_TITLE');
 	    if (! empty($conf->global->MAIN_APPLICATION_TITLE))
 	    {
 	    	$appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl='';

From f15425be520ac5fbdcccc0813bfd2870a11ca9be Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 15:45:35 +0100
Subject: [PATCH 123/216] Include the link "Back to list" on banner of all user
 tabs.

---
 htdocs/holiday/list.php         |  4 +++-
 htdocs/user/agenda_extsites.php |  4 +++-
 htdocs/user/card.php            |  4 +++-
 htdocs/user/clicktodial.php     |  4 +++-
 htdocs/user/document.php        |  4 +++-
 htdocs/user/info.php            | 14 +++++++++-----
 htdocs/user/ldap.php            |  4 +++-
 htdocs/user/note.php            |  4 +++-
 htdocs/user/param_ihm.php       |  8 ++++++--
 htdocs/user/perms.php           |  3 ++-
 10 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index b309eade0f4..09d7d165d1f 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -231,7 +231,9 @@ if ($id > 0)
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'paidholidays', $title, 0, 'user');
 
-    dol_banner_tab($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
+	
+    dol_banner_tab($fuser,'id',$linkback,$user->rights->user->user->lire || $user->admin);
     
     
     print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index dc5ec528a21..1dd494cb3e8 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -153,7 +153,9 @@ $head=user_prepare_head($object);
 
 dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user');
 
-dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+$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="underbanner clearboth"></div>';
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 407941c28fd..83762e988ee 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1156,7 +1156,9 @@ else
         {
 			dol_fiche_head($head, 'user', $title, 0, 'user');
 
-	        dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+            $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">';
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 13aaff9560f..fb3104dc285 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -91,7 +91,9 @@ if ($id > 0)
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'clicktodial', $title, 0, 'user');
 
-    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+	$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="underbanner clearboth"></div>';
     
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index ef4f6650818..b8152f33a85 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -129,7 +129,9 @@ if ($object->id)
 
 	dol_fiche_head($head, 'document', $langs->trans("User"),0,'user');
 
-    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+	$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="underbanner clearboth"></div>';
 	
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index f069ac4782b..1d10875b3eb 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -32,7 +32,10 @@ $langs->load("users");
 // Security check
 $id = GETPOST('id','int');
 $object = new User($db);
-$object->fetch($id);
+if ($id > 0 || ! empty($ref))
+{
+	$result = $object->fetch($id, $ref);
+}
 
 // Security check
 $socid=0;
@@ -58,17 +61,18 @@ $form = new Form($db);
 
 llxHeader();
 
-$object->info($id);
-
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
 dol_fiche_head($head, 'info', $title, 0, 'user');
 
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php">'.$langs->trans("BackToList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+
+
+$object->info($id); // This overwrite ->ref with login instead of id
 
 
 print '<div class="fichecenter">';
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 48e4f8fcbb6..968c3e565a5 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -93,7 +93,9 @@ $head = user_prepare_head($object);
 $title = $langs->trans("User");
 dol_fiche_head($head, 'ldap', $title, 0, 'user');
 
-dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+$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="underbanner clearboth"></div>';
 
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 7780227fb00..ccd7eb153a4 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -89,7 +89,9 @@ if ($id)
 	$title = $langs->trans("User");
 	dol_fiche_head($head, 'note', $title, 0, 'user');
 
-    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+	$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="underbanner clearboth"></div>';
     
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 85b4ba04e84..724f2572be2 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -151,7 +151,9 @@ if ($action == 'edit')
 {
     dol_fiche_head($head, 'guisetup', $title, 0, 'user');
     
-    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+    $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="underbanner clearboth"></div>';
@@ -251,7 +253,9 @@ else
 {
     dol_fiche_head($head, 'guisetup', $title, 0, 'user');
     
-    dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+    $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="underbanner clearboth"></div>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 750035e2dda..ae32a624175 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -256,8 +256,9 @@ else
  * Ecran ajout/suppression permission
  */
 
+$linkback = '<a href="'.DOL_URL_ROOT.'/user/index.php">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin);
+dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin);
 
 
 print '<div class="underbanner clearboth"></div>';

From 832afa139a94b000df5247e35ab2e992fc21233d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 16:13:50 +0100
Subject: [PATCH 124/216] Update skeleton to generate a list page and a card
 page.

---
 dev/skeletons/build_class_from_table.php      | 301 +++++++---------
 dev/skeletons/skeleton_card.php               | 325 ++++++++++++++++++
 .../{skeleton_page.php => skeleton_list.php}  | 181 +---------
 3 files changed, 453 insertions(+), 354 deletions(-)
 create mode 100644 dev/skeletons/skeleton_card.php
 rename dev/skeletons/{skeleton_page.php => skeleton_list.php} (68%)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index f4f25c84391..6aff50161a9 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -450,186 +450,137 @@ else $error++;
 
 
 
-//--------------------------------
-// Build skeleton_script.php
-//--------------------------------
+//--------------------------------------------------------------------
+// Build skeleton_script.php, skeleton_list.php and skeleton_card.php
+//--------------------------------------------------------------------
 
-// Read skeleton_script.php file
-$skeletonfile=$path.'skeleton_script.php';
-$sourcecontent=file_get_contents($skeletonfile);
-if (! $sourcecontent)
+$skeletonfiles=array(
+    $path.'skeleton_script.php' => 'out.'.$classmin.'_script.php', 
+    $path.'skeleton_list.php' => 'out.'.$classmin.'_list.php', 
+    $path.'skeleton_card.php' => 'out.'.$classmin.'_card.php'
+    );
+    
+foreach ($skeletonfiles as $skeletonfile => $outfile)
 {
-	print "\n";
-	print "Error: Failed to read skeleton sample '".$skeletonfile."'\n";
-	print "Try to run script from skeletons directory.\n";
-	exit;
+    $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 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 print_liste_field_titre
+    $varprop="\n";
+    $cleanparam='';
+    foreach($property as $key => $prop)
+    {
+    	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
+    	{
+    	    $varprop.="print_liste_field_titre(\$langs->trans('".$prop['field']."'),\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$param,'',\$sortfield,\$sortorder);\n";
+    	}
+    }
+    
+    $targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field1'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field2'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', '', $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.="print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $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++;
 }
 
-// Define output variables
-$outfile='out.'.$classmin.'_script.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('/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);
-
-// 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++;
-
-
-
-//--------------------------------
-// Build skeleton_page.php
-//--------------------------------
-
-// Read skeleton_page.php file
-$skeletonfile=$path.'skeleton_page.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.'.$classmin.'_page.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('/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 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 print_liste_field_titre
-$varprop="\n";
-$cleanparam='';
-foreach($property as $key => $prop)
-{
-	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
-	{
-	    $varprop.="print_liste_field_titre(\$langs->trans('".$prop['field']."'),\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$param,'',\$sortfield,\$sortorder);\n";
-	}
-}
-
-$targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field1'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field2'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', '', $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.="print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
-	}
-}
-$targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-$targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $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 can now rename generated files by removing the 'out.' prefix in their name and store them into directory /yourmodule/class.\n";
+print "You can now rename generated files by removing the 'out.' prefix in their name and store them into directory /yourmodule/class (for .class.php file) or /yourmodule.\n";
 return $error;
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
new file mode 100644
index 00000000000..a7191560108
--- /dev/null
+++ b/dev/skeletons/skeleton_card.php
@@ -0,0 +1,325 @@
+<?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("companies");
+$langs->load("other");
+
+// Get parameters
+$id			= GETPOST('id','int');
+$action		= GETPOST('action','alpha');
+$backtopage = GETPOST('backtopage');
+$myparam	= GETPOST('myparam','alpha');
+
+$search_field1=GETPOST("search_field1");
+$search_field2=GETPOST("search_field2");
+
+// Protection if external user
+if ($user->societe_id > 0)
+{
+	//accessforbidden();
+}
+
+if (empty($action) && empty($id) && empty($ref)) $action='list';
+
+// 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);
+}
+
+// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('skeleton'));
+$extrafields = new ExtraFields($db);
+
+
+
+/*******************************************************************
+* ACTIONS
+*
+* Put here all code to do according to value of "action" parameter
+********************************************************************/
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+	// 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++;
+			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'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';
+		}
+	}
+
+	// Cancel
+	if ($action == 'update' && GETPOST('cancel')) $action='view';
+
+	// Action to update record
+	if ($action == 'update' && ! GETPOST('cancel'))
+	{
+		$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("NewSkeleton"));
+
+	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>';
+	print '<input class="flat" type="text" size="36" name="label" value="'.$label.'">';
+	print '</td></tr>';
+
+	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 '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+	dol_fiche_head();
+
+	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+
+	dol_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></div>';
+
+	print '</form>';
+}
+
+
+
+// Part to show record
+if ($id && (empty($action) || $action == 'view'))
+{
+	dol_fiche_head();
+
+
+
+	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)
+		{
+			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with 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"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+	}
+	print '</div>'."\n";
+
+
+	// Example 2 : Adding links to objects
+	//$somethingshown=$form->showLinkedObjectBlock($object);
+	//$linktoelem = $form->showLinkToObjectBlock($object);
+	//if ($linktoelem) print '<br>'.$linktoelem;
+
+}
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_list.php
similarity index 68%
rename from dev/skeletons/skeleton_page.php
rename to dev/skeletons/skeleton_list.php
index c1e12c2f93c..06a88a23020 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_list.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *   	\file       dev/skeletons/skeleton_page.php
+ *   	\file       dev/skeletons/skeleton_list.php
  *		\ingroup    mymodule othermodule1 othermodule2
  *		\brief      This file is an example of a php page
  *					Put here some comments
@@ -93,89 +93,6 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	// 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++;
-			setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Ref")),'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';
-		}
-	}
-
-	// Cancel
-	if ($action == 'update' && GETPOST('cancel')) $action='view';
-
-	// Action to update record
-	if ($action == 'update' && ! GETPOST('cancel'))
-	{
-		$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')
 	{
@@ -184,7 +101,7 @@ if (empty($reshook))
 		{
 			// Delete OK
 			setEventMessages("RecordDeleted", null, 'mesgs');
-			header("Location: ".dol_buildpath('/buildingmanagement/list.php',1));
+			header("Location: ".dol_buildpath('/mymodule/list.php',1));
 			exit;
 		}
 		else
@@ -347,100 +264,6 @@ if ($action == 'list' || (empty($id) && $action != 'create'))
 }
 
 
-
-// Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("NewSkeleton"));
-
-	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>';
-	print '<input class="flat" type="text" size="36" name="label" value="'.$label.'">';
-	print '</td></tr>';
-
-	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 '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-
-	dol_fiche_head();
-
-	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-
-	dol_fiche_end();
-
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></div>';
-
-	print '</form>';
-}
-
-
-
-// Part to show record
-if ($id && (empty($action) || $action == 'view'))
-{
-	dol_fiche_head();
-
-
-
-	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)
-		{
-			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with 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"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-			}
-		}
-	}
-	print '</div>'."\n";
-
-
-	// Example 2 : Adding links to objects
-	//$somethingshown=$form->showLinkedObjectBlock($object);
-	//$linktoelem = $form->showLinkToObjectBlock($object);
-	//if ($linktoelem) print '<br>'.$linktoelem;
-
-}
-
-
 // End of page
 llxFooter();
 $db->close();

From 0b4a1b827ae0d9cfbc4db527176acafd5d855dd0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 16:21:44 +0100
Subject: [PATCH 125/216] Update demo database

---
 dev/initdata/mysqldump_dolibarr_3.8.0.sql | 72 +++++++++++------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/dev/initdata/mysqldump_dolibarr_3.8.0.sql b/dev/initdata/mysqldump_dolibarr_3.8.0.sql
index ba88c642d41..fa5243cb2ac 100644
--- a/dev/initdata/mysqldump_dolibarr_3.8.0.sql
+++ b/dev/initdata/mysqldump_dolibarr_3.8.0.sql
@@ -382,7 +382,7 @@ CREATE TABLE `llx_adherent` (
 
 LOCK TABLES `llx_adherent` WRITE;
 /*!40000 ALTER TABLE `llx_adherent` DISABLE KEYS */;
-INSERT INTO `llx_adherent` VALUES (1,1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',2,'phy',NULL,10,NULL,NULL,NULL,NULL,'102','vsmith@email.com',NULL,NULL,NULL,NULL,'1960-07-07',NULL,1,0,'2012-07-09 00:00:00',NULL,NULL,'2010-07-10 15:12:56','2010-07-08 23:50:00','2013-03-20 13:30:11',1,1,1,NULL,NULL),(2,1,NULL,NULL,'Pierre','Curie','pcurie','pcuriedolibarr',2,'phy',NULL,12,NULL,NULL,NULL,NULL,'1','pcurie@example.com','',NULL,NULL,NULL,'1972-07-08',NULL,1,1,'2017-07-17 00:00:00',NULL,NULL,'2010-07-10 15:03:32','2010-07-10 15:03:09','2015-10-03 09:08:58',1,1,1,NULL,NULL),(3,1,NULL,NULL,'john','doe','john','8bs6gty5',2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,'1','johndoe@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,NULL,'2011-07-18 21:28:00','2011-07-18 21:10:09','2015-10-03 09:28:46',1,1,1,NULL,NULL),(4,1,NULL,NULL,'smith','smith','Smith','s6hjp10f',2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,'11','smith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,NULL,'2011-07-18 21:27:52','2011-07-18 21:27:44','2015-10-03 09:40:27',1,1,1,NULL,NULL);
+INSERT INTO `llx_adherent` VALUES (1,1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',2,'phy',NULL,10,NULL,NULL,NULL,NULL,'102','vsmith@email.com',NULL,NULL,NULL,NULL,'1960-07-07',NULL,1,0,'2012-07-09 00:00:00',NULL,NULL,'2010-07-10 15:12:56','2010-07-08 23:50:00','2013-03-20 13:30:11',1,1,1,NULL,NULL),(2,1,NULL,NULL,'Curie','Pierre','pcurie','pcuriedolibarr',2,'phy',NULL,12,NULL,NULL,NULL,NULL,'1','pcurie@example.com','',NULL,NULL,NULL,'1972-07-08',NULL,1,1,'2017-07-17 00:00:00',NULL,NULL,'2010-07-10 15:03:32','2010-07-10 15:03:09','2015-10-05 19:57:57',1,12,1,NULL,NULL),(3,1,NULL,NULL,'john','doe','john','8bs6gty5',2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,'1','johndoe@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,NULL,'2011-07-18 21:28:00','2011-07-18 21:10:09','2015-10-03 09:28:46',1,1,1,NULL,NULL),(4,1,NULL,NULL,'smith','smith','Smith','s6hjp10f',2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,'11','smith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,1,0,NULL,NULL,NULL,'2011-07-18 21:27:52','2011-07-18 21:27:44','2015-10-03 09:40:27',1,1,1,NULL,NULL);
 /*!40000 ALTER TABLE `llx_adherent` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1058,7 +1058,7 @@ CREATE TABLE `llx_boxes` (
   KEY `idx_boxes_boxid` (`box_id`),
   KEY `idx_boxes_fk_user` (`fk_user`),
   CONSTRAINT `fk_boxes_box_id` FOREIGN KEY (`box_id`) REFERENCES `llx_boxes_def` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=787 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=811 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1067,7 +1067,7 @@ CREATE TABLE `llx_boxes` (
 
 LOCK TABLES `llx_boxes` WRITE;
 /*!40000 ALTER TABLE `llx_boxes` DISABLE KEYS */;
-INSERT INTO `llx_boxes` VALUES (12,1,20,0,'A09',0,NULL,NULL),(73,1,21,0,'B16',0,NULL,NULL),(153,1,288,0,'A21',0,NULL,NULL),(154,1,289,0,'A07',0,NULL,NULL),(155,1,290,0,'A17',0,NULL,NULL),(160,1,295,0,'A13',0,NULL,NULL),(161,1,296,0,'A15',0,NULL,NULL),(162,1,297,0,'B12',0,NULL,NULL),(163,1,298,0,'B20',0,NULL,NULL),(164,1,299,0,'B10',0,NULL,NULL),(177,1,309,0,'B18',0,NULL,NULL),(240,1,316,0,'A05',0,NULL,NULL),(241,1,317,0,'B04',0,NULL,NULL),(253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(372,1,334,0,'0',0,NULL,NULL),(373,1,335,0,'0',0,NULL,NULL),(374,1,336,0,'0',0,NULL,NULL),(439,1,337,0,'0',0,NULL,NULL),(440,1,338,0,'0',0,NULL,NULL),(441,1,339,0,'0',0,NULL,NULL),(442,1,340,0,'0',0,NULL,NULL),(531,1,341,0,'0',0,NULL,NULL),(532,1,342,0,'0',0,NULL,NULL),(533,1,343,0,'0',0,NULL,NULL),(534,1,344,0,'0',0,NULL,NULL),(535,1,345,0,'0',0,NULL,NULL),(772,1,343,0,'A01',1,NULL,NULL),(773,1,342,0,'A02',1,NULL,NULL),(774,1,335,0,'A03',1,NULL,NULL),(775,1,339,0,'A04',1,NULL,NULL),(776,1,317,0,'A05',1,NULL,NULL),(777,1,299,0,'A06',1,NULL,NULL),(778,1,289,0,'A07',1,NULL,NULL),(779,1,336,0,'B01',1,NULL,NULL),(780,1,341,0,'B02',1,NULL,NULL),(781,1,340,0,'B03',1,NULL,NULL),(782,1,298,0,'B04',1,NULL,NULL),(783,1,295,0,'B05',1,NULL,NULL),(784,1,290,0,'B06',1,NULL,NULL),(785,1,297,0,'B07',1,NULL,NULL),(786,1,20,0,'B08',1,NULL,NULL);
+INSERT INTO `llx_boxes` VALUES (12,1,20,0,'A09',0,NULL,NULL),(73,1,21,0,'B16',0,NULL,NULL),(153,1,288,0,'A21',0,NULL,NULL),(154,1,289,0,'A07',0,NULL,NULL),(155,1,290,0,'A17',0,NULL,NULL),(160,1,295,0,'A13',0,NULL,NULL),(161,1,296,0,'A15',0,NULL,NULL),(162,1,297,0,'B12',0,NULL,NULL),(163,1,298,0,'B20',0,NULL,NULL),(164,1,299,0,'B10',0,NULL,NULL),(177,1,309,0,'B18',0,NULL,NULL),(240,1,316,0,'A05',0,NULL,NULL),(241,1,317,0,'B04',0,NULL,NULL),(253,2,323,0,'0',0,NULL,NULL),(304,2,324,0,'0',0,NULL,NULL),(305,2,325,0,'0',0,NULL,NULL),(306,2,326,0,'0',0,NULL,NULL),(307,2,327,0,'0',0,NULL,NULL),(308,2,328,0,'0',0,NULL,NULL),(309,2,329,0,'0',0,NULL,NULL),(310,2,330,0,'0',0,NULL,NULL),(311,2,331,0,'0',0,NULL,NULL),(312,2,332,0,'0',0,NULL,NULL),(313,2,333,0,'0',0,NULL,NULL),(372,1,334,0,'0',0,NULL,NULL),(373,1,335,0,'0',0,NULL,NULL),(374,1,336,0,'0',0,NULL,NULL),(439,1,337,0,'0',0,NULL,NULL),(440,1,338,0,'0',0,NULL,NULL),(441,1,339,0,'0',0,NULL,NULL),(442,1,340,0,'0',0,NULL,NULL),(531,1,341,0,'0',0,NULL,NULL),(532,1,342,0,'0',0,NULL,NULL),(533,1,343,0,'0',0,NULL,NULL),(534,1,344,0,'0',0,NULL,NULL),(535,1,345,0,'0',0,NULL,NULL),(772,1,343,0,'A01',1,NULL,NULL),(773,1,342,0,'A02',1,NULL,NULL),(774,1,335,0,'A03',1,NULL,NULL),(775,1,339,0,'A04',1,NULL,NULL),(776,1,317,0,'A05',1,NULL,NULL),(777,1,299,0,'A06',1,NULL,NULL),(778,1,289,0,'A07',1,NULL,NULL),(779,1,336,0,'B01',1,NULL,NULL),(780,1,341,0,'B02',1,NULL,NULL),(781,1,340,0,'B03',1,NULL,NULL),(782,1,298,0,'B04',1,NULL,NULL),(783,1,295,0,'B05',1,NULL,NULL),(784,1,290,0,'B06',1,NULL,NULL),(785,1,297,0,'B07',1,NULL,NULL),(786,1,20,0,'B08',1,NULL,NULL),(787,1,345,0,'A01',11,NULL,NULL),(788,1,335,0,'A02',11,NULL,NULL),(789,1,336,0,'A03',11,NULL,NULL),(790,1,337,0,'A04',11,NULL,NULL),(791,1,338,0,'A05',11,NULL,NULL),(792,1,339,0,'A06',11,NULL,NULL),(793,1,340,0,'A07',11,NULL,NULL),(794,1,342,0,'A08',11,NULL,NULL),(795,1,343,0,'A09',11,NULL,NULL),(796,1,344,0,'A10',11,NULL,NULL),(797,1,334,0,'A11',11,NULL,NULL),(798,1,316,0,'A12',11,NULL,NULL),(799,1,289,0,'A13',11,NULL,NULL),(800,1,20,0,'A14',11,NULL,NULL),(801,1,295,0,'A15',11,NULL,NULL),(802,1,296,0,'A16',11,NULL,NULL),(803,1,290,0,'A17',11,NULL,NULL),(804,1,288,0,'A18',11,NULL,NULL),(805,1,317,0,'B01',11,NULL,NULL),(806,1,299,0,'B02',11,NULL,NULL),(807,1,341,0,'B03',11,NULL,NULL),(808,1,297,0,'B04',11,NULL,NULL),(809,1,21,0,'B05',11,NULL,NULL),(810,1,298,0,'B06',11,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3237,7 +3237,7 @@ CREATE TABLE `llx_const` (
   `tms` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=5360 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5376 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3246,7 +3246,7 @@ CREATE TABLE `llx_const` (
 
 LOCK TABLES `llx_const` WRITE;
 /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */;
-INSERT INTO `llx_const` VALUES (5,'SYSLOG_LEVEL',0,'7','chaine',0,'Level of debug info to show','2010-07-08 11:17:57'),(8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(35,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(242,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2010-07-08 11:26:34'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(252,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2010-07-08 11:29:05'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(260,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2010-07-08 11:29:18'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(271,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2010-07-08 11:29:37'),(272,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:41'),(273,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:45'),(274,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2010-07-08 11:29:59'),(275,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2010-07-08 11:30:03'),(276,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2010-07-08 11:30:30'),(278,'MAIN_MODULE_GEOIPMAXMIND',1,'1',NULL,0,NULL,'2010-07-08 11:30:36'),(279,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2010-07-08 11:30:38'),(292,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2010-07-08 11:56:27'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(370,'MAIN_SUBMODULE_LIVRAISON',1,'1','chaine',0,'','2010-07-08 23:00:29'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(384,'PRODUIT_SOUSPRODUITS',1,'1','chaine',0,'','2010-07-08 23:22:12'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(523,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(524,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(525,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(526,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(527,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(528,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(529,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(530,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2010-07-10 12:48:49'),(531,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(532,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(533,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(534,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(602,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2010-07-11 13:26:54'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(807,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(808,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(834,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2011-07-18 17:30:24'),(969,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2011-07-18 18:01:59'),(973,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2011-07-18 18:02:20'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(978,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2011-07-18 18:03:06'),(979,'PRELEVEMENT_USER',1,'1','chaine',0,'','2011-07-18 18:05:50'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(981,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1018,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2011-07-20 11:36:47'),(1138,'MAIN_VERSION_LAST_INSTALL',0,'3.1.0-beta','chaine',0,'Dolibarr version when install','2011-07-28 23:05:02'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1379,'CABINETMED_RHEUMATOLOGY_ON',1,'1','chaine',1,'Enable features for rheumatology','2011-08-01 21:47:53'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1718,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2012-12-08 13:12:41'),(1719,'ACCOUNTING_USEDICTTOEDIT',1,'1','chaine',1,'','2012-12-08 13:15:00'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1737,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1738,'MAIN_INFO_SOCIETE_NOM',2,'aaa','chaine',0,'','2012-12-08 14:08:14'),(1739,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2013-02-27 14:20:27'),(1740,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2012-12-08 14:08:14'),(1741,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2012-12-08 14:08:14'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1867,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2012-12-11 22:53:56'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2040,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2015-07-19 13:41:06'),(2041,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2015-07-19 13:41:06'),(2044,'MAIN_MAIL_EMAIL_TLS',1,'1','chaine',0,'','2015-07-19 13:41:06'),(2251,'FCKEDITOR_TEST',1,'Test<br />\r\n<img alt=\"\" src=\"/dolibarrnew/viewimage.php?modulepart=fckeditor&amp;file=image/Julien-Lavergne_reference_medium.jpg\" style=\"width: 200px; height: 172px;\" />fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2305,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2013-01-02 20:33:16'),(2307,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2013-01-02 20:33:17'),(2310,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2013-01-02 20:33:18'),(2315,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2013-01-02 20:33:21'),(2786,'MAIN_SOAP_DEBUG',1,'1','chaine',1,'','2013-01-13 12:37:21'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2866,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4555,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2013-03-13 10:19:31'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4698,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2013-03-13 17:22:24'),(4699,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2015-07-19 13:41:06'),(4700,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2015-07-19 13:41:06'),(4701,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2015-07-19 13:41:06'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4919,'MAIN_MODULE_COMPTABILITE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4922,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5137,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,NULL,'2013-09-08 23:06:08'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5164,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,NULL,'2013-11-06 23:35:12'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidonge','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5203,'MODULE_GOOGLE_DEBUG',1,'1','chaine',1,'','2013-11-07 00:16:31'),(5235,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2014-03-02 15:22:27'),(5237,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2014-03-02 15:37:37'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2014-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2014-12-21 12:51:28'),(5273,'DONATION_ART885',1,'','yesno',0,'Option Française - Eligibilité Art885-0 V bis du CGI','2014-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2014-12-21 12:51:28'),(5278,'PRODUCT_USE_OLD_PATH_FOR_PHOTO',0,'1','chaine',1,'Use old path for products images','2015-07-19 13:40:55'),(5282,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,NULL,'2015-07-19 13:41:20'),(5288,'DONATION_ACCOUNTINGACCOUNT',1,'7581','chaine',0,'Compte comptable de remise des versements ou dons','2015-07-19 13:41:21'),(5300,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2015-10-03 08:46:14'),(5301,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2015-10-03 08:46:14'),(5302,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2015-10-03 08:46:14'),(5303,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5304,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5305,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5306,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5307,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5308,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5309,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2015-10-03 08:46:15'),(5310,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2015-10-03 08:46:15'),(5311,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2015-10-03 08:46:16'),(5312,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2015-10-03 08:46:16'),(5313,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2015-10-03 08:46:16'),(5314,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2015-10-03 08:46:16'),(5315,'MAIN_VERSION_LAST_UPGRADE',0,'3.8.1','chaine',0,'Dolibarr version for last upgrade','2015-10-03 08:46:18'),(5317,'INVOICE_CAN_ALWAYS_BE_REMOVED',1,'1','chaine',1,'','2015-10-03 09:25:30'),(5318,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2015-10-03 10:11:01'),(5319,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2015-10-03 10:11:01'),(5320,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2015-10-03 10:11:01'),(5321,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2015-10-03 10:11:01'),(5322,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2015-10-03 10:11:01'),(5323,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2015-10-03 10:11:01'),(5324,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2015-10-03 10:11:01'),(5325,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2015-10-03 10:11:01'),(5326,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2015-10-03 10:11:01'),(5327,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2015-10-03 10:11:01'),(5328,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2015-10-03 10:11:01'),(5329,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2015-10-03 10:11:01'),(5330,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2015-10-03 10:11:01'),(5331,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2015-10-03 10:11:01'),(5332,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2015-10-03 10:11:01'),(5333,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2015-10-03 10:11:01'),(5334,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2015-10-03 10:11:01'),(5335,'MAIN_INFO_TVAINTRA',1,'FR1234567','chaine',0,'','2015-10-03 10:11:01'),(5336,'SOCIETE_FISCAL_MONTH_START',1,'1','chaine',0,'','2015-10-03 10:11:01'),(5337,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2015-10-03 10:11:01'),(5338,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2015-10-03 10:11:33'),(5339,'MAIN_MULTILANGS',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5340,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2015-10-03 10:11:33'),(5341,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5342,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5343,'MAIN_START_WEEK',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5344,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2015-10-03 10:11:33'),(5345,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2015-10-03 10:11:33'),(5346,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5347,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5348,'MAIN_THEME',1,'eldy','chaine',0,'','2015-10-03 10:11:33'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5350,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5355,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2015-10-03 10:11:33'),(5356,'MAIN_HOME',1,'<span style=\"font-size:11px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2015-10-03 10:11:33'),(5357,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2015-10-03 10:11:33'),(5358,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5359,'THEME_ELDY_USE_HOVER',1,'1','chaine',0,'','2015-10-03 10:11:33');
+INSERT INTO `llx_const` VALUES (5,'SYSLOG_LEVEL',0,'7','chaine',0,'Level of debug info to show','2010-07-08 11:17:57'),(8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(35,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(242,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2010-07-08 11:26:34'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(252,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2010-07-08 11:29:05'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(260,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2010-07-08 11:29:18'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(271,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2010-07-08 11:29:37'),(272,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:41'),(273,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:45'),(274,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2010-07-08 11:29:59'),(275,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2010-07-08 11:30:03'),(276,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2010-07-08 11:30:30'),(278,'MAIN_MODULE_GEOIPMAXMIND',1,'1',NULL,0,NULL,'2010-07-08 11:30:36'),(279,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2010-07-08 11:30:38'),(292,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2010-07-08 11:56:27'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(370,'MAIN_SUBMODULE_LIVRAISON',1,'1','chaine',0,'','2010-07-08 23:00:29'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(384,'PRODUIT_SOUSPRODUITS',1,'1','chaine',0,'','2010-07-08 23:22:12'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(523,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(524,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(525,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(526,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(527,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(528,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(529,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(530,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2010-07-10 12:48:49'),(531,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(532,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(533,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(534,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(602,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2010-07-11 13:26:54'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(807,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(808,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(834,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2011-07-18 17:30:24'),(969,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2011-07-18 18:01:59'),(973,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2011-07-18 18:02:20'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(978,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2011-07-18 18:03:06'),(979,'PRELEVEMENT_USER',1,'1','chaine',0,'','2011-07-18 18:05:50'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(981,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1018,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2011-07-20 11:36:47'),(1138,'MAIN_VERSION_LAST_INSTALL',0,'3.1.0-beta','chaine',0,'Dolibarr version when install','2011-07-28 23:05:02'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1379,'CABINETMED_RHEUMATOLOGY_ON',1,'1','chaine',1,'Enable features for rheumatology','2011-08-01 21:47:53'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1718,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2012-12-08 13:12:41'),(1719,'ACCOUNTING_USEDICTTOEDIT',1,'1','chaine',1,'','2012-12-08 13:15:00'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1737,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1738,'MAIN_INFO_SOCIETE_NOM',2,'aaa','chaine',0,'','2012-12-08 14:08:14'),(1739,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2013-02-27 14:20:27'),(1740,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2012-12-08 14:08:14'),(1741,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2012-12-08 14:08:14'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1867,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2012-12-11 22:53:56'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2040,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2015-07-19 13:41:06'),(2041,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2015-07-19 13:41:06'),(2044,'MAIN_MAIL_EMAIL_TLS',1,'1','chaine',0,'','2015-07-19 13:41:06'),(2251,'FCKEDITOR_TEST',1,'Test<br />\r\n<img alt=\"\" src=\"/dolibarrnew/viewimage.php?modulepart=fckeditor&amp;file=image/Julien-Lavergne_reference_medium.jpg\" style=\"width: 200px; height: 172px;\" />fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2305,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2013-01-02 20:33:16'),(2307,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2013-01-02 20:33:17'),(2310,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2013-01-02 20:33:18'),(2315,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2013-01-02 20:33:21'),(2786,'MAIN_SOAP_DEBUG',1,'1','chaine',1,'','2013-01-13 12:37:21'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2866,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4555,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2013-03-13 10:19:31'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4698,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2013-03-13 17:22:24'),(4699,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2015-07-19 13:41:06'),(4700,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2015-07-19 13:41:06'),(4701,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2015-07-19 13:41:06'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4919,'MAIN_MODULE_COMPTABILITE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4922,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5137,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,NULL,'2013-09-08 23:06:08'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5164,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,NULL,'2013-11-06 23:35:12'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidonge','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5203,'MODULE_GOOGLE_DEBUG',1,'1','chaine',1,'','2013-11-07 00:16:31'),(5235,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2014-03-02 15:22:27'),(5237,'MAIN_MODULE_GRAVATAR',1,'1',NULL,0,NULL,'2014-03-02 15:37:37'),(5239,'BOOKMARKS_SHOW_IN_MENU',1,'10','chaine',0,'','2014-03-02 15:42:26'),(5271,'DONATION_ART200',1,'','yesno',0,'Option Française - Eligibilité Art200 du CGI','2014-12-21 12:51:28'),(5272,'DONATION_ART238',1,'','yesno',0,'Option Française - Eligibilité Art238 bis du CGI','2014-12-21 12:51:28'),(5273,'DONATION_ART885',1,'','yesno',0,'Option Française - Eligibilité Art885-0 V bis du CGI','2014-12-21 12:51:28'),(5274,'DONATION_MESSAGE',1,'Thank you','chaine',0,'Message affiché sur le récépissé de versements ou dons','2014-12-21 12:51:28'),(5278,'PRODUCT_USE_OLD_PATH_FOR_PHOTO',0,'1','chaine',1,'Use old path for products images','2015-07-19 13:40:55'),(5282,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,NULL,'2015-07-19 13:41:20'),(5288,'DONATION_ACCOUNTINGACCOUNT',1,'7581','chaine',0,'Compte comptable de remise des versements ou dons','2015-07-19 13:41:21'),(5317,'INVOICE_CAN_ALWAYS_BE_REMOVED',1,'1','chaine',1,'','2015-10-03 09:25:30'),(5318,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2015-10-03 10:11:01'),(5319,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2015-10-03 10:11:01'),(5320,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2015-10-03 10:11:01'),(5321,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2015-10-03 10:11:01'),(5322,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2015-10-03 10:11:01'),(5323,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2015-10-03 10:11:01'),(5324,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2015-10-03 10:11:01'),(5325,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2015-10-03 10:11:01'),(5326,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2015-10-03 10:11:01'),(5327,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2015-10-03 10:11:01'),(5328,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2015-10-03 10:11:01'),(5329,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2015-10-03 10:11:01'),(5330,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2015-10-03 10:11:01'),(5331,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2015-10-03 10:11:01'),(5332,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2015-10-03 10:11:01'),(5333,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2015-10-03 10:11:01'),(5334,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2015-10-03 10:11:01'),(5335,'MAIN_INFO_TVAINTRA',1,'FR1234567','chaine',0,'','2015-10-03 10:11:01'),(5336,'SOCIETE_FISCAL_MONTH_START',1,'1','chaine',0,'','2015-10-03 10:11:01'),(5337,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2015-10-03 10:11:01'),(5338,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2015-10-03 10:11:33'),(5339,'MAIN_MULTILANGS',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5340,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2015-10-03 10:11:33'),(5341,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5342,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5343,'MAIN_START_WEEK',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5344,'MAIN_DEFAULT_WORKING_DAYS',1,'1-5','chaine',0,'','2015-10-03 10:11:33'),(5345,'MAIN_DEFAULT_WORKING_HOURS',1,'9-18','chaine',0,'','2015-10-03 10:11:33'),(5346,'MAIN_SHOW_LOGO',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5347,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5348,'MAIN_THEME',1,'eldy','chaine',0,'','2015-10-03 10:11:33'),(5349,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5350,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5351,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5352,'MAIN_SEARCHFORM_PRODUITSERVICE_SUPPLIER',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5353,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5354,'MAIN_SEARCHFORM_PROJECT',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5355,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2015-10-03 10:11:33'),(5356,'MAIN_HOME',1,'<span style=\"font-size:11px\">__(NoteSomeFeaturesAreDisabled)__<br />\r\n<br />\r\n__(SomeTranslationAreUncomplete)__</span>','chaine',0,'','2015-10-03 10:11:33'),(5357,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2015-10-03 10:11:33'),(5358,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2015-10-03 10:11:33'),(5359,'THEME_ELDY_USE_HOVER',1,'1','chaine',0,'','2015-10-03 10:11:33'),(5360,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5361,'MAIN_MODULE_BARCODE',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5362,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5363,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5364,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5365,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5366,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5367,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5368,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5369,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2015-10-29 18:14:51'),(5370,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->read:/holiday/list.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2015-10-29 18:14:51'),(5371,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2015-10-29 18:14:52'),(5372,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2015-10-29 18:14:52'),(5373,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2015-10-29 18:14:52'),(5374,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2015-10-29 18:14:52'),(5375,'MAIN_VERSION_LAST_UPGRADE',0,'3.8.2','chaine',0,'Dolibarr version for last upgrade','2015-10-29 18:14:55');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3614,7 +3614,7 @@ CREATE TABLE `llx_document_model` (
   `description` text,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=236 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=240 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3623,7 +3623,7 @@ CREATE TABLE `llx_document_model` (
 
 LOCK TABLES `llx_document_model` WRITE;
 /*!40000 ALTER TABLE `llx_document_model` DISABLE KEYS */;
-INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(15,'fsfe.fr.php',1,'donation',NULL,NULL),(21,'baleine',1,'project',NULL,NULL),(174,'azur',1,'propal',NULL,NULL),(175,'rouget',1,'shipping',NULL,NULL),(176,'typhon',1,'delivery',NULL,NULL),(178,'soleil',1,'ficheinter',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(232,'einstein',1,'order',NULL,NULL),(233,'html_cerfafr',1,'donation',NULL,NULL),(234,'crabe',1,'invoice',NULL,NULL),(235,'muscadet',1,'order_supplier',NULL,NULL);
+INSERT INTO `llx_document_model` VALUES (9,'merou',1,'shipping',NULL,NULL),(15,'fsfe.fr.php',1,'donation',NULL,NULL),(21,'baleine',1,'project',NULL,NULL),(174,'azur',1,'propal',NULL,NULL),(175,'rouget',1,'shipping',NULL,NULL),(176,'typhon',1,'delivery',NULL,NULL),(178,'soleil',1,'ficheinter',NULL,NULL),(181,'generic_invoice_odt',1,'invoice','ODT templates','FACTURE_ADDON_PDF_ODT_PATH'),(193,'canelle2',1,'invoice_supplier','canelle2',NULL),(195,'canelle',1,'invoice_supplier','canelle',NULL),(198,'azur',2,'propal',NULL,NULL),(199,'html_cerfafr',2,'donation',NULL,NULL),(200,'crabe',2,'invoice',NULL,NULL),(201,'generic_odt',1,'company','ODT templates','COMPANY_ADDON_PDF_ODT_PATH'),(236,'einstein',1,'order',NULL,NULL),(237,'html_cerfafr',1,'donation',NULL,NULL),(238,'crabe',1,'invoice',NULL,NULL),(239,'muscadet',1,'order_supplier',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4075,7 +4075,7 @@ CREATE TABLE `llx_entrepot` (
   `import_key` varchar(14) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_entrepot_label` (`label`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4084,7 +4084,7 @@ CREATE TABLE `llx_entrepot` (
 
 LOCK TABLES `llx_entrepot` WRITE;
 /*!40000 ALTER TABLE `llx_entrepot` DISABLE KEYS */;
-INSERT INTO `llx_entrepot` VALUES (1,'2010-07-09 00:31:22','2010-07-08 22:40:36','WAREHOUSEHOUSTON',1,'Warehouse located at Houston','Warehouse houston','','','Houston',NULL,11,1,NULL,1,NULL),(2,'2010-07-09 00:41:03','2010-07-08 22:41:03','WAREHOUSEPARIS',1,'<br />','Warehouse Paris','','75000','Paris',NULL,1,1,NULL,1,NULL),(3,'2010-07-11 16:18:59','2010-07-11 14:18:59','Stock personnel Dupont',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de Alain Dupont','','','','',NULL,0,1,NULL,1,NULL),(4,'2013-01-23 17:52:27','2013-01-23 16:52:27','Stock personnel aaa',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaa','','','','',NULL,81,1,NULL,1,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','Stock personnel bbb',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de bbb','','','','',NULL,81,1,NULL,1,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','Stock personnel aaab',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaab','','','','',NULL,1,1,NULL,1,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','Stock personnel zzz',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzz','','','','',NULL,1,1,NULL,1,NULL),(8,'2013-02-16 20:50:07','2013-02-16 19:50:07','Stock personnel zzzg',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzzg','','','','',NULL,1,1,NULL,1,NULL),(9,'2015-10-03 11:47:41','2015-10-03 09:47:41','Personal stock Marie Curie',1,'This warehouse represents personal stock of Marie Curie','','','','',NULL,1,1,NULL,1,NULL);
+INSERT INTO `llx_entrepot` VALUES (1,'2010-07-09 00:31:22','2010-07-08 22:40:36','WAREHOUSEHOUSTON',1,'Warehouse located at Houston','Warehouse houston','','','Houston',NULL,11,1,NULL,1,NULL),(2,'2010-07-09 00:41:03','2010-07-08 22:41:03','WAREHOUSEPARIS',1,'<br />','Warehouse Paris','','75000','Paris',NULL,1,1,NULL,1,NULL),(3,'2010-07-11 16:18:59','2010-07-11 14:18:59','Stock personnel Dupont',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de Alain Dupont','','','','',NULL,0,1,NULL,1,NULL),(4,'2013-01-23 17:52:27','2013-01-23 16:52:27','Stock personnel aaa',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaa','','','','',NULL,81,1,NULL,1,NULL),(5,'2013-01-23 17:52:37','2013-01-23 16:52:37','Stock personnel bbb',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de bbb','','','','',NULL,81,1,NULL,1,NULL),(6,'2013-02-16 20:22:40','2013-02-16 19:22:40','Stock personnel aaab',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de aaab','','','','',NULL,1,1,NULL,1,NULL),(7,'2013-02-16 20:48:15','2013-02-16 19:48:15','Stock personnel zzz',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzz','','','','',NULL,1,1,NULL,1,NULL),(8,'2013-02-16 20:50:07','2013-02-16 19:50:07','Stock personnel zzzg',1,'Cet entrep&ocirc;t repr&eacute;sente le stock personnel de zzzg','','','','',NULL,1,1,NULL,1,NULL),(9,'2015-10-03 11:47:41','2015-10-03 09:47:41','Personal stock Marie Curie',1,'This warehouse represents personal stock of Marie Curie','','','','',NULL,1,1,NULL,1,NULL),(10,'2015-10-05 09:07:52','2015-10-05 07:07:52','Personal stock Alex Theceo',1,'This warehouse represents personal stock of Alex Theceo','','','','',NULL,1,1,NULL,1,NULL),(11,'2015-10-05 09:09:46','2015-10-05 07:09:46','Personal stock Alice theceo',1,'This warehouse represents personal stock of Alice theceo','','','','',NULL,1,1,NULL,1,NULL),(12,'2015-10-05 21:29:35','2015-10-05 19:29:35','Personal stock Charly Commery',1,'This warehouse represents personal stock of Charly Commery','','','','',NULL,1,1,NULL,11,NULL),(13,'2015-10-05 21:33:33','2015-10-05 19:33:33','Personal stock Sam Scientol',1,'This warehouse represents personal stock of Sam Scientol','','','','',NULL,1,1,NULL,11,NULL),(14,'2015-10-05 21:45:43','2015-10-05 19:45:43','Personal stock aaa',1,'This warehouse represents personal stock of aaa','','','','',NULL,1,1,NULL,12,NULL),(15,'2015-10-05 22:47:52','2015-10-05 20:47:52','Personal stock cc1',1,'This warehouse represents personal stock of cc1','','','','',NULL,1,1,NULL,12,NULL),(16,'2015-10-05 22:48:39','2015-10-05 20:48:39','Personal stock cc2',1,'This warehouse represents personal stock of cc2','','','','',NULL,1,1,NULL,11,NULL),(17,'2015-10-05 23:13:00','2015-10-05 21:13:00','Personal stock aaa aaa',1,'This warehouse represents personal stock of aaa aaa','','','','',NULL,1,1,NULL,12,NULL);
 /*!40000 ALTER TABLE `llx_entrepot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4133,7 +4133,7 @@ CREATE TABLE `llx_events` (
   `fk_object` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_events_dateevent` (`dateevent`)
-) ENGINE=InnoDB AUTO_INCREMENT=591 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=690 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4142,7 +4142,7 @@ CREATE TABLE `llx_events` (
 
 LOCK TABLES `llx_events` WRITE;
 /*!40000 ALTER TABLE `llx_events` DISABLE KEYS */;
-INSERT INTO `llx_events` VALUES (30,'2011-07-18 18:23:06','USER_LOGOUT',1,'2011-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(31,'2011-07-18 18:23:12','USER_LOGIN_FAILED',1,'2011-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(32,'2011-07-18 18:23:17','USER_LOGIN',1,'2011-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(33,'2011-07-18 20:10:51','USER_LOGIN_FAILED',1,'2011-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(34,'2011-07-18 20:10:55','USER_LOGIN',1,'2011-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(35,'2011-07-18 21:18:57','USER_LOGIN',1,'2011-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(36,'2011-07-20 10:34:10','USER_LOGIN',1,'2011-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(37,'2011-07-20 12:36:44','USER_LOGIN',1,'2011-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(38,'2011-07-20 13:20:51','USER_LOGIN_FAILED',1,'2011-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(39,'2011-07-20 13:20:54','USER_LOGIN',1,'2011-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(40,'2011-07-20 15:03:46','USER_LOGIN_FAILED',1,'2011-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(41,'2011-07-20 15:03:55','USER_LOGIN',1,'2011-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(42,'2011-07-20 18:05:05','USER_LOGIN_FAILED',1,'2011-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(43,'2011-07-20 18:05:08','USER_LOGIN',1,'2011-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(44,'2011-07-20 21:08:53','USER_LOGIN_FAILED',1,'2011-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(45,'2011-07-20 21:08:56','USER_LOGIN',1,'2011-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(46,'2011-07-21 01:26:12','USER_LOGIN',1,'2011-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(47,'2011-07-21 22:35:45','USER_LOGIN_FAILED',1,'2011-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(48,'2011-07-21 22:35:49','USER_LOGIN',1,'2011-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(49,'2011-07-26 23:09:47','USER_LOGIN_FAILED',1,'2011-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(50,'2011-07-26 23:09:50','USER_LOGIN',1,'2011-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(51,'2011-07-27 17:02:27','USER_LOGIN_FAILED',1,'2011-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(52,'2011-07-27 17:02:32','USER_LOGIN',1,'2011-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(53,'2011-07-27 23:33:37','USER_LOGIN_FAILED',1,'2011-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(54,'2011-07-27 23:33:41','USER_LOGIN',1,'2011-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(55,'2011-07-28 18:20:36','USER_LOGIN_FAILED',1,'2011-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(56,'2011-07-28 18:20:38','USER_LOGIN',1,'2011-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(57,'2011-07-28 20:13:30','USER_LOGIN_FAILED',1,'2011-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(58,'2011-07-28 20:13:34','USER_LOGIN',1,'2011-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(59,'2011-07-28 20:22:51','USER_LOGIN',1,'2011-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(60,'2011-07-28 23:05:06','USER_LOGIN',1,'2011-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(61,'2011-07-29 20:15:50','USER_LOGIN_FAILED',1,'2011-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(62,'2011-07-29 20:15:53','USER_LOGIN',1,'2011-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(68,'2011-07-29 20:51:01','USER_LOGOUT',1,'2011-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(69,'2011-07-29 20:51:05','USER_LOGIN',1,'2011-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(70,'2011-07-30 08:46:20','USER_LOGIN_FAILED',1,'2011-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(71,'2011-07-30 08:46:38','USER_LOGIN_FAILED',1,'2011-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(72,'2011-07-30 08:46:42','USER_LOGIN',1,'2011-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(73,'2011-07-30 10:05:12','USER_LOGIN_FAILED',1,'2011-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(74,'2011-07-30 10:05:15','USER_LOGIN',1,'2011-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(75,'2011-07-30 12:15:46','USER_LOGIN',1,'2011-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(76,'2011-07-31 22:19:30','USER_LOGIN',1,'2011-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(77,'2011-07-31 23:32:52','USER_LOGIN',1,'2011-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(78,'2011-08-01 01:24:50','USER_LOGIN_FAILED',1,'2011-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(79,'2011-08-01 01:24:54','USER_LOGIN',1,'2011-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(80,'2011-08-01 19:31:36','USER_LOGIN_FAILED',1,'2011-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(81,'2011-08-01 19:31:39','USER_LOGIN',1,'2011-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(82,'2011-08-01 20:01:36','USER_LOGIN',1,'2011-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(83,'2011-08-01 20:52:54','USER_LOGIN_FAILED',1,'2011-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(84,'2011-08-01 20:52:58','USER_LOGIN',1,'2011-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(85,'2011-08-01 21:17:28','USER_LOGIN_FAILED',1,'2011-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(86,'2011-08-01 21:17:31','USER_LOGIN',1,'2011-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(87,'2011-08-04 11:55:17','USER_LOGIN',1,'2011-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(88,'2011-08-04 20:19:03','USER_LOGIN_FAILED',1,'2011-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(89,'2011-08-04 20:19:07','USER_LOGIN',1,'2011-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(90,'2011-08-05 17:51:42','USER_LOGIN_FAILED',1,'2011-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(91,'2011-08-05 17:51:47','USER_LOGIN',1,'2011-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(92,'2011-08-05 17:56:03','USER_LOGIN',1,'2011-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(93,'2011-08-05 17:59:10','USER_LOGIN',1,'2011-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(94,'2011-08-05 18:01:58','USER_LOGIN',1,'2011-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(95,'2011-08-05 19:59:56','USER_LOGIN',1,'2011-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(96,'2011-08-06 18:33:22','USER_LOGIN',1,'2011-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(97,'2011-08-07 00:56:59','USER_LOGIN',1,'2011-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(98,'2011-08-07 22:49:14','USER_LOGIN',1,'2011-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(99,'2011-08-07 23:05:18','USER_LOGOUT',1,'2011-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(105,'2011-08-08 00:41:09','USER_LOGIN',1,'2011-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(106,'2011-08-08 11:58:55','USER_LOGIN',1,'2011-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(107,'2011-08-08 14:35:48','USER_LOGIN',1,'2011-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(108,'2011-08-08 14:36:31','USER_LOGOUT',1,'2011-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(109,'2011-08-08 14:38:28','USER_LOGIN',1,'2011-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(110,'2011-08-08 14:39:02','USER_LOGOUT',1,'2011-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(111,'2011-08-08 14:39:10','USER_LOGIN',1,'2011-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(112,'2011-08-08 14:39:28','USER_LOGOUT',1,'2011-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(113,'2011-08-08 14:39:37','USER_LOGIN',1,'2011-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(114,'2011-08-08 14:50:02','USER_LOGOUT',1,'2011-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(115,'2011-08-08 14:51:45','USER_LOGIN_FAILED',1,'2011-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(116,'2011-08-08 14:51:52','USER_LOGIN',1,'2011-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(117,'2011-08-08 15:09:54','USER_LOGOUT',1,'2011-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(118,'2011-08-08 15:10:19','USER_LOGIN_FAILED',1,'2011-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(119,'2011-08-08 15:10:28','USER_LOGIN',1,'2011-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(121,'2011-08-08 15:14:58','USER_LOGOUT',1,'2011-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(122,'2011-08-08 15:15:00','USER_LOGIN_FAILED',1,'2011-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(123,'2011-08-08 15:17:57','USER_LOGIN',1,'2011-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(124,'2011-08-08 15:35:56','USER_LOGOUT',1,'2011-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(125,'2011-08-08 15:36:05','USER_LOGIN',1,'2011-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(126,'2011-08-08 17:32:42','USER_LOGIN',1,'2011-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(127,'2012-12-08 13:49:37','USER_LOGOUT',1,'2012-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(128,'2012-12-08 13:49:42','USER_LOGIN',1,'2012-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(129,'2012-12-08 13:50:12','USER_LOGOUT',1,'2012-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(130,'2012-12-08 13:50:14','USER_LOGIN',1,'2012-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(131,'2012-12-08 13:50:17','USER_LOGOUT',1,'2012-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(132,'2012-12-08 13:52:47','USER_LOGIN',1,'2012-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(133,'2012-12-08 13:53:08','USER_MODIFY',1,'2012-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(134,'2012-12-08 14:08:45','USER_LOGOUT',1,'2012-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(135,'2012-12-08 14:09:09','USER_LOGIN',1,'2012-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(136,'2012-12-08 14:11:43','USER_LOGOUT',1,'2012-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(137,'2012-12-08 14:11:45','USER_LOGIN',1,'2012-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(138,'2012-12-08 14:22:53','USER_LOGOUT',1,'2012-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(139,'2012-12-08 14:22:54','USER_LOGIN',1,'2012-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(140,'2012-12-08 14:23:10','USER_LOGOUT',1,'2012-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(141,'2012-12-08 14:23:11','USER_LOGIN',1,'2012-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(142,'2012-12-08 14:23:49','USER_LOGOUT',1,'2012-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(143,'2012-12-08 14:23:50','USER_LOGIN',1,'2012-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(144,'2012-12-08 14:28:08','USER_LOGOUT',1,'2012-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(145,'2012-12-08 14:35:15','USER_LOGIN',1,'2012-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(146,'2012-12-08 14:35:18','USER_LOGOUT',1,'2012-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(147,'2012-12-08 14:36:07','USER_LOGIN',1,'2012-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(148,'2012-12-08 14:36:09','USER_LOGOUT',1,'2012-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(149,'2012-12-08 14:36:41','USER_LOGIN',1,'2012-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(150,'2012-12-08 15:59:13','USER_LOGIN',1,'2012-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(151,'2012-12-09 11:49:52','USER_LOGIN',1,'2012-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(152,'2012-12-09 13:46:31','USER_LOGIN',1,'2012-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(153,'2012-12-09 19:03:14','USER_LOGIN',1,'2012-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(154,'2012-12-10 00:16:31','USER_LOGIN',1,'2012-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(170,'2012-12-11 22:03:31','USER_LOGIN',1,'2012-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(171,'2012-12-12 00:32:39','USER_LOGIN',1,'2012-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(172,'2012-12-12 10:49:59','USER_LOGIN',1,'2012-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(175,'2012-12-12 10:57:40','USER_MODIFY',1,'2012-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(176,'2012-12-12 13:29:15','USER_LOGIN',1,'2012-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(177,'2012-12-12 13:30:15','USER_LOGIN',1,'2012-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(178,'2012-12-12 13:40:08','USER_LOGOUT',1,'2012-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(179,'2012-12-12 13:40:10','USER_LOGIN',1,'2012-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(180,'2012-12-12 13:40:26','USER_MODIFY',1,'2012-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(181,'2012-12-12 13:40:34','USER_LOGOUT',1,'2012-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(182,'2012-12-12 13:42:23','USER_LOGIN',1,'2012-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(183,'2012-12-12 13:43:02','USER_NEW_PASSWORD',1,'2012-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(184,'2012-12-12 13:43:25','USER_LOGOUT',1,'2012-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(185,'2012-12-12 13:43:27','USER_LOGIN_FAILED',1,'2012-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(186,'2012-12-12 13:43:30','USER_LOGIN',1,'2012-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(187,'2012-12-12 14:52:11','USER_LOGIN',1,'2012-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(188,'2012-12-12 17:53:00','USER_LOGIN_FAILED',1,'2012-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(189,'2012-12-12 17:53:07','USER_LOGIN_FAILED',1,'2012-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(190,'2012-12-12 17:53:51','USER_NEW_PASSWORD',1,'2012-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(191,'2012-12-12 17:54:00','USER_LOGIN',1,'2012-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(192,'2012-12-12 17:54:10','USER_NEW_PASSWORD',1,'2012-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(193,'2012-12-12 17:54:10','USER_MODIFY',1,'2012-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(194,'2012-12-12 18:57:09','USER_LOGIN',1,'2012-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(195,'2012-12-12 23:04:08','USER_LOGIN',1,'2012-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(196,'2012-12-17 20:03:14','USER_LOGIN',1,'2012-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(197,'2012-12-17 21:18:45','USER_LOGIN',1,'2012-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(198,'2012-12-17 22:30:08','USER_LOGIN',1,'2012-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(199,'2012-12-18 23:32:03','USER_LOGIN',1,'2012-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(200,'2012-12-19 09:38:03','USER_LOGIN',1,'2012-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(201,'2012-12-19 11:23:35','USER_LOGIN',1,'2012-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(202,'2012-12-19 12:46:22','USER_LOGIN',1,'2012-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(214,'2012-12-19 19:11:31','USER_LOGIN',1,'2012-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(215,'2012-12-21 16:36:57','USER_LOGIN',1,'2012-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(216,'2012-12-21 16:38:43','USER_NEW_PASSWORD',1,'2012-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(217,'2012-12-21 16:38:43','USER_MODIFY',1,'2012-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(218,'2012-12-21 16:38:51','USER_LOGOUT',1,'2012-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(219,'2012-12-21 16:38:55','USER_LOGIN',1,'2012-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(220,'2012-12-21 16:48:18','USER_LOGOUT',1,'2012-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(221,'2012-12-21 16:48:20','USER_LOGIN',1,'2012-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(222,'2012-12-26 18:28:18','USER_LOGIN',1,'2012-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(223,'2012-12-26 20:00:24','USER_LOGIN',1,'2012-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(224,'2012-12-27 01:10:27','USER_LOGIN',1,'2012-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(225,'2012-12-28 19:12:08','USER_LOGIN',1,'2012-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(226,'2012-12-28 20:16:58','USER_LOGIN',1,'2012-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(227,'2012-12-29 14:35:46','USER_LOGIN',1,'2012-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(228,'2012-12-29 14:37:59','USER_LOGOUT',1,'2012-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(229,'2012-12-29 14:38:00','USER_LOGIN',1,'2012-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(230,'2012-12-29 17:16:48','USER_LOGIN',1,'2012-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(231,'2012-12-31 12:02:59','USER_LOGIN',1,'2012-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(232,'2013-01-02 20:32:51','USER_LOGIN',1,'2013-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL),(233,'2013-01-02 20:58:59','USER_LOGIN',1,'2013-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(234,'2013-01-03 09:25:07','USER_LOGIN',1,'2013-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(235,'2013-01-03 19:39:31','USER_LOGIN',1,'2013-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(236,'2013-01-04 22:40:19','USER_LOGIN',1,'2013-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(237,'2013-01-05 12:59:59','USER_LOGIN',1,'2013-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(238,'2013-01-05 15:28:52','USER_LOGIN',1,'2013-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(239,'2013-01-05 17:02:08','USER_LOGIN',1,'2013-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(240,'2013-01-06 12:13:33','USER_LOGIN',1,'2013-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(241,'2013-01-07 01:21:15','USER_LOGIN',1,'2013-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(242,'2013-01-07 01:46:31','USER_LOGOUT',1,'2013-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(243,'2013-01-07 19:54:50','USER_LOGIN',1,'2013-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(244,'2013-01-08 21:55:01','USER_LOGIN',1,'2013-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(245,'2013-01-09 11:13:28','USER_LOGIN',1,'2013-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(246,'2013-01-10 18:30:46','USER_LOGIN',1,'2013-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(247,'2013-01-11 18:03:26','USER_LOGIN',1,'2013-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(248,'2013-01-12 11:15:04','USER_LOGIN',1,'2013-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(249,'2013-01-12 14:42:44','USER_LOGIN',1,'2013-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(250,'2013-01-13 12:07:17','USER_LOGIN',1,'2013-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(251,'2013-01-13 17:37:58','USER_LOGIN',1,'2013-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(252,'2013-01-13 19:24:21','USER_LOGIN',1,'2013-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(253,'2013-01-13 19:29:19','USER_LOGOUT',1,'2013-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(254,'2013-01-13 21:39:39','USER_LOGIN',1,'2013-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(255,'2013-01-14 00:52:21','USER_LOGIN',1,'2013-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(256,'2013-01-16 11:34:31','USER_LOGIN',1,'2013-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(257,'2013-01-16 15:36:21','USER_LOGIN',1,'2013-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(258,'2013-01-16 19:17:36','USER_LOGIN',1,'2013-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(259,'2013-01-16 19:48:08','GROUP_CREATE',1,'2013-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(260,'2013-01-16 21:48:53','USER_LOGIN',1,'2013-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(261,'2013-01-17 19:55:53','USER_LOGIN',1,'2013-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(262,'2013-01-18 09:48:01','USER_LOGIN',1,'2013-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(263,'2013-01-18 13:22:36','USER_LOGIN',1,'2013-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(264,'2013-01-18 16:10:23','USER_LOGIN',1,'2013-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(265,'2013-01-18 17:41:40','USER_LOGIN',1,'2013-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(266,'2013-01-19 14:33:48','USER_LOGIN',1,'2013-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(267,'2013-01-19 16:47:43','USER_LOGIN',1,'2013-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(268,'2013-01-19 16:59:43','USER_LOGIN',1,'2013-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(269,'2013-01-19 17:00:22','USER_LOGIN',1,'2013-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(270,'2013-01-19 17:04:16','USER_LOGOUT',1,'2013-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(271,'2013-01-19 17:04:18','USER_LOGIN',1,'2013-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(272,'2013-01-20 00:34:19','USER_LOGIN',1,'2013-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(273,'2013-01-21 11:54:17','USER_LOGIN',1,'2013-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(274,'2013-01-21 13:48:15','USER_LOGIN',1,'2013-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(275,'2013-01-21 14:30:22','USER_LOGIN',1,'2013-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(276,'2013-01-21 15:10:46','USER_LOGIN',1,'2013-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(277,'2013-01-21 17:27:43','USER_LOGIN',1,'2013-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(278,'2013-01-21 21:48:15','USER_LOGIN',1,'2013-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(279,'2013-01-21 21:50:42','USER_LOGIN',1,'2013-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(280,'2013-01-23 09:28:26','USER_LOGIN',1,'2013-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(281,'2013-01-23 13:21:57','USER_LOGIN',1,'2013-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(282,'2013-01-23 16:52:00','USER_LOGOUT',1,'2013-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(283,'2013-01-23 16:52:05','USER_LOGIN_FAILED',1,'2013-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(284,'2013-01-23 16:52:09','USER_LOGIN',1,'2013-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(285,'2013-01-23 16:52:27','USER_CREATE',1,'2013-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(286,'2013-01-23 16:52:27','USER_NEW_PASSWORD',1,'2013-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(287,'2013-01-23 16:52:37','USER_CREATE',1,'2013-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(288,'2013-01-23 16:52:37','USER_NEW_PASSWORD',1,'2013-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(289,'2013-01-23 16:53:15','USER_LOGOUT',1,'2013-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(290,'2013-01-23 16:53:20','USER_LOGIN',1,'2013-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(291,'2013-01-23 19:16:58','USER_LOGIN',1,'2013-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(292,'2013-01-26 10:54:07','USER_LOGIN',1,'2013-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(293,'2013-01-29 10:15:36','USER_LOGIN',1,'2013-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(294,'2013-01-30 17:42:50','USER_LOGIN',1,'2013-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(295,'2013-02-01 08:49:55','USER_LOGIN',1,'2013-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(296,'2013-02-01 08:51:57','USER_LOGOUT',1,'2013-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(297,'2013-02-01 08:52:39','USER_LOGIN',1,'2013-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(298,'2013-02-01 21:03:01','USER_LOGIN',1,'2013-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(299,'2013-02-10 19:48:39','USER_LOGIN',1,'2013-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(300,'2013-02-10 20:46:48','USER_LOGIN',1,'2013-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(301,'2013-02-10 21:39:23','USER_LOGIN',1,'2013-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(302,'2013-02-11 19:00:13','USER_LOGIN',1,'2013-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(303,'2013-02-11 19:43:44','USER_LOGIN_FAILED',1,'2013-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(304,'2013-02-11 19:44:01','USER_LOGIN',1,'2013-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(305,'2013-02-12 00:27:35','USER_LOGIN',1,'2013-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(306,'2013-02-12 00:27:38','USER_LOGOUT',1,'2013-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(307,'2013-02-12 00:28:07','USER_LOGIN',1,'2013-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(308,'2013-02-12 00:28:09','USER_LOGOUT',1,'2013-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(309,'2013-02-12 00:28:26','USER_LOGIN',1,'2013-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(310,'2013-02-12 00:28:30','USER_LOGOUT',1,'2013-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(311,'2013-02-12 12:42:15','USER_LOGIN',1,'2013-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(312,'2013-02-12 13:46:16','USER_LOGIN',1,'2013-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(313,'2013-02-12 14:54:28','USER_LOGIN',1,'2013-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(314,'2013-02-12 16:04:46','USER_LOGIN',1,'2013-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(315,'2013-02-13 14:02:43','USER_LOGIN',1,'2013-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(316,'2013-02-13 14:48:30','USER_LOGIN',1,'2013-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(317,'2013-02-13 17:44:53','USER_LOGIN',1,'2013-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(318,'2013-02-15 08:44:36','USER_LOGIN',1,'2013-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(319,'2013-02-15 08:53:20','USER_LOGIN',1,'2013-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(320,'2013-02-16 19:10:28','USER_LOGIN',1,'2013-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(321,'2013-02-16 19:22:40','USER_CREATE',1,'2013-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(322,'2013-02-16 19:22:40','USER_NEW_PASSWORD',1,'2013-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(323,'2013-02-16 19:48:15','USER_CREATE',1,'2013-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(324,'2013-02-16 19:48:15','USER_NEW_PASSWORD',1,'2013-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(325,'2013-02-16 19:50:08','USER_CREATE',1,'2013-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(326,'2013-02-16 19:50:08','USER_NEW_PASSWORD',1,'2013-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(327,'2013-02-16 21:20:03','USER_LOGIN',1,'2013-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(328,'2013-02-17 14:30:51','USER_LOGIN',1,'2013-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(329,'2013-02-17 17:21:22','USER_LOGIN',1,'2013-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(330,'2013-02-17 17:48:43','USER_MODIFY',1,'2013-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(331,'2013-02-17 17:48:47','USER_MODIFY',1,'2013-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(332,'2013-02-17 17:48:51','USER_MODIFY',1,'2013-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(333,'2013-02-17 17:48:56','USER_MODIFY',1,'2013-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(334,'2013-02-18 22:00:01','USER_LOGIN',1,'2013-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(335,'2013-02-19 08:19:52','USER_LOGIN',1,'2013-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(336,'2013-02-19 22:00:52','USER_LOGIN',1,'2013-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(337,'2013-02-20 09:34:52','USER_LOGIN',1,'2013-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(338,'2013-02-20 13:12:28','USER_LOGIN',1,'2013-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(339,'2013-02-20 17:19:44','USER_LOGIN',1,'2013-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(340,'2013-02-20 19:07:21','USER_MODIFY',1,'2013-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(341,'2013-02-20 19:47:17','USER_LOGIN',1,'2013-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(342,'2013-02-20 19:48:01','USER_MODIFY',1,'2013-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(343,'2013-02-21 08:27:07','USER_LOGIN',1,'2013-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(344,'2013-02-23 13:34:13','USER_LOGIN',1,'2013-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(345,'2013-02-24 01:06:41','USER_LOGIN_FAILED',1,'2013-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(346,'2013-02-24 01:06:45','USER_LOGIN_FAILED',1,'2013-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(347,'2013-02-24 01:06:55','USER_LOGIN_FAILED',1,'2013-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(348,'2013-02-24 01:07:03','USER_LOGIN_FAILED',1,'2013-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(349,'2013-02-24 01:07:21','USER_LOGIN_FAILED',1,'2013-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(350,'2013-02-24 01:08:12','USER_LOGIN_FAILED',1,'2013-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(351,'2013-02-24 01:08:42','USER_LOGIN_FAILED',1,'2013-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(352,'2013-02-24 01:08:50','USER_LOGIN_FAILED',1,'2013-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(353,'2013-02-24 01:09:08','USER_LOGIN_FAILED',1,'2013-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(354,'2013-02-24 01:09:42','USER_LOGIN_FAILED',1,'2013-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(355,'2013-02-24 01:09:50','USER_LOGIN_FAILED',1,'2013-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(356,'2013-02-24 01:10:05','USER_LOGIN_FAILED',1,'2013-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(357,'2013-02-24 01:10:22','USER_LOGIN_FAILED',1,'2013-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(358,'2013-02-24 01:10:30','USER_LOGIN_FAILED',1,'2013-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(359,'2013-02-24 01:10:56','USER_LOGIN_FAILED',1,'2013-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(360,'2013-02-24 01:11:26','USER_LOGIN_FAILED',1,'2013-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(361,'2013-02-24 01:12:06','USER_LOGIN_FAILED',1,'2013-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(362,'2013-02-24 01:21:14','USER_LOGIN_FAILED',1,'2013-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(363,'2013-02-24 01:21:25','USER_LOGIN_FAILED',1,'2013-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(364,'2013-02-24 01:21:54','USER_LOGIN_FAILED',1,'2013-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(365,'2013-02-24 01:22:14','USER_LOGIN_FAILED',1,'2013-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(366,'2013-02-24 01:22:37','USER_LOGIN_FAILED',1,'2013-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(367,'2013-02-24 01:23:01','USER_LOGIN_FAILED',1,'2013-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(368,'2013-02-24 01:23:39','USER_LOGIN_FAILED',1,'2013-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(369,'2013-02-24 01:24:04','USER_LOGIN_FAILED',1,'2013-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(370,'2013-02-24 01:24:39','USER_LOGIN_FAILED',1,'2013-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(371,'2013-02-24 01:25:01','USER_LOGIN_FAILED',1,'2013-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(372,'2013-02-24 01:25:12','USER_LOGIN_FAILED',1,'2013-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(373,'2013-02-24 01:27:30','USER_LOGIN_FAILED',1,'2013-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(374,'2013-02-24 01:28:00','USER_LOGIN_FAILED',1,'2013-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(375,'2013-02-24 01:28:35','USER_LOGIN_FAILED',1,'2013-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(376,'2013-02-24 01:29:03','USER_LOGIN_FAILED',1,'2013-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(377,'2013-02-24 01:29:55','USER_LOGIN_FAILED',1,'2013-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(378,'2013-02-24 01:32:40','USER_LOGIN_FAILED',1,'2013-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(379,'2013-02-24 01:39:33','USER_LOGIN_FAILED',1,'2013-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(380,'2013-02-24 01:39:38','USER_LOGIN_FAILED',1,'2013-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(381,'2013-02-24 01:39:47','USER_LOGIN_FAILED',1,'2013-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(382,'2013-02-24 01:40:54','USER_LOGIN_FAILED',1,'2013-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(383,'2013-02-24 01:47:57','USER_LOGIN_FAILED',1,'2013-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(384,'2013-02-24 01:48:05','USER_LOGIN_FAILED',1,'2013-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(385,'2013-02-24 01:48:07','USER_LOGIN_FAILED',1,'2013-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(386,'2013-02-24 01:48:35','USER_LOGIN',1,'2013-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(387,'2013-02-24 01:56:32','USER_LOGIN',1,'2013-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(388,'2013-02-24 02:05:55','USER_LOGOUT',1,'2013-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(389,'2013-02-24 02:39:52','USER_LOGIN',1,'2013-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(390,'2013-02-24 02:51:10','USER_LOGOUT',1,'2013-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(391,'2013-02-24 12:46:41','USER_LOGIN',1,'2013-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(392,'2013-02-24 12:46:52','USER_LOGOUT',1,'2013-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(393,'2013-02-24 12:46:56','USER_LOGIN',1,'2013-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(394,'2013-02-24 12:47:56','USER_LOGOUT',1,'2013-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(395,'2013-02-24 12:48:00','USER_LOGIN',1,'2013-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(396,'2013-02-24 12:48:11','USER_LOGOUT',1,'2013-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(397,'2013-02-24 12:48:32','USER_LOGIN',1,'2013-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(398,'2013-02-24 12:52:22','USER_LOGOUT',1,'2013-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(399,'2013-02-24 12:52:27','USER_LOGIN',1,'2013-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(400,'2013-02-24 12:52:54','USER_LOGOUT',1,'2013-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(401,'2013-02-24 12:52:59','USER_LOGIN',1,'2013-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(402,'2013-02-24 12:55:39','USER_LOGOUT',1,'2013-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(403,'2013-02-24 12:55:59','USER_LOGIN',1,'2013-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(404,'2013-02-24 12:56:07','USER_LOGOUT',1,'2013-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(405,'2013-02-24 12:56:23','USER_LOGIN',1,'2013-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(406,'2013-02-24 12:56:46','USER_LOGOUT',1,'2013-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(407,'2013-02-24 12:58:30','USER_LOGIN',1,'2013-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(408,'2013-02-24 12:58:33','USER_LOGOUT',1,'2013-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(409,'2013-02-24 12:58:51','USER_LOGIN',1,'2013-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(410,'2013-02-24 12:58:58','USER_LOGOUT',1,'2013-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(411,'2013-02-24 13:18:53','USER_LOGIN',1,'2013-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(412,'2013-02-24 13:19:52','USER_LOGOUT',1,'2013-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(413,'2013-02-24 15:39:31','USER_LOGIN_FAILED',1,'2013-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL),(414,'2013-02-24 15:42:07','USER_LOGIN',1,'2013-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL),(415,'2013-02-24 15:42:52','USER_LOGOUT',1,'2013-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(416,'2013-02-24 16:04:21','USER_LOGIN',1,'2013-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(417,'2013-02-24 16:11:28','USER_LOGIN_FAILED',1,'2013-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(418,'2013-02-24 16:11:37','USER_LOGIN',1,'2013-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(419,'2013-02-24 16:36:52','USER_LOGOUT',1,'2013-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(420,'2013-02-24 16:40:37','USER_LOGIN',1,'2013-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(421,'2013-02-24 16:57:16','USER_LOGIN',1,'2013-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(422,'2013-02-24 17:01:30','USER_LOGOUT',1,'2013-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(423,'2013-02-24 17:02:33','USER_LOGIN',1,'2013-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(424,'2013-02-24 17:14:22','USER_LOGOUT',1,'2013-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(425,'2013-02-24 17:15:07','USER_LOGIN_FAILED',1,'2013-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(426,'2013-02-24 17:15:20','USER_LOGIN',1,'2013-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(427,'2013-02-24 17:20:14','USER_LOGIN',1,'2013-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(428,'2013-02-24 17:20:51','USER_LOGIN',1,'2013-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(429,'2013-02-24 17:20:54','USER_LOGOUT',1,'2013-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(430,'2013-02-24 17:21:19','USER_LOGIN',1,'2013-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(431,'2013-02-24 17:32:35','USER_LOGIN',1,'2013-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(432,'2013-02-24 18:28:48','USER_LOGIN',1,'2013-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(433,'2013-02-24 18:29:27','USER_LOGOUT',1,'2013-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(434,'2013-02-24 18:29:32','USER_LOGIN',1,'2013-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(435,'2013-02-24 20:13:13','USER_LOGOUT',1,'2013-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(436,'2013-02-24 20:13:17','USER_LOGIN',1,'2013-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(437,'2013-02-25 08:57:16','USER_LOGIN',1,'2013-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(438,'2013-02-25 08:57:59','USER_LOGOUT',1,'2013-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(439,'2013-02-25 09:15:02','USER_LOGIN',1,'2013-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(440,'2013-02-25 09:15:50','USER_LOGOUT',1,'2013-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(441,'2013-02-25 09:15:57','USER_LOGIN',1,'2013-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(442,'2013-02-25 09:16:12','USER_LOGOUT',1,'2013-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(443,'2013-02-25 09:16:19','USER_LOGIN',1,'2013-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(444,'2013-02-25 09:16:25','USER_LOGOUT',1,'2013-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(445,'2013-02-25 09:16:39','USER_LOGIN_FAILED',1,'2013-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(446,'2013-02-25 09:16:42','USER_LOGIN_FAILED',1,'2013-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(447,'2013-02-25 09:16:54','USER_LOGIN_FAILED',1,'2013-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(448,'2013-02-25 09:17:53','USER_LOGIN',1,'2013-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(449,'2013-02-25 09:18:37','USER_LOGOUT',1,'2013-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(450,'2013-02-25 09:18:41','USER_LOGIN',1,'2013-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(451,'2013-02-25 09:18:47','USER_LOGOUT',1,'2013-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(452,'2013-02-25 10:05:34','USER_LOGIN',1,'2013-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(453,'2013-02-26 21:51:40','USER_LOGIN',1,'2013-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(454,'2013-02-26 23:30:06','USER_LOGIN',1,'2013-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(455,'2013-02-27 14:13:11','USER_LOGIN',1,'2013-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(456,'2013-02-27 18:12:06','USER_LOGIN_FAILED',1,'2013-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(457,'2013-02-27 18:12:10','USER_LOGIN',1,'2013-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(458,'2013-02-27 20:20:08','USER_LOGIN',1,'2013-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(459,'2013-03-01 22:12:03','USER_LOGIN',1,'2013-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(460,'2013-03-02 11:45:50','USER_LOGIN',1,'2013-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(461,'2013-03-02 15:53:51','USER_LOGIN_FAILED',1,'2013-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(462,'2013-03-02 15:53:53','USER_LOGIN',1,'2013-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(463,'2013-03-02 18:32:32','USER_LOGIN',1,'2013-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(464,'2013-03-02 22:59:36','USER_LOGIN',1,'2013-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(465,'2013-03-03 16:26:26','USER_LOGIN',1,'2013-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(466,'2013-03-03 22:50:27','USER_LOGIN',1,'2013-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(467,'2013-03-04 08:29:27','USER_LOGIN',1,'2013-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(468,'2013-03-04 18:27:28','USER_LOGIN',1,'2013-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL),(469,'2013-03-04 19:27:23','USER_LOGIN',1,'2013-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL),(470,'2013-03-04 19:35:14','USER_LOGIN',1,'2013-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(471,'2013-03-04 19:55:49','USER_LOGIN',1,'2013-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL),(472,'2013-03-04 21:16:13','USER_LOGIN',1,'2013-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(473,'2013-03-05 10:17:30','USER_LOGIN',1,'2013-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(474,'2013-03-05 11:02:43','USER_LOGIN',1,'2013-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(475,'2013-03-05 23:14:39','USER_LOGIN',1,'2013-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(476,'2013-03-06 08:58:57','USER_LOGIN',1,'2013-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(477,'2013-03-06 14:29:40','USER_LOGIN',1,'2013-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(478,'2013-03-06 21:53:02','USER_LOGIN',1,'2013-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(479,'2013-03-07 21:14:39','USER_LOGIN',1,'2013-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(480,'2013-03-08 00:06:05','USER_LOGIN',1,'2013-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(481,'2013-03-08 01:38:13','USER_LOGIN',1,'2013-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(482,'2013-03-08 08:59:50','USER_LOGIN',1,'2013-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(483,'2013-03-09 12:08:51','USER_LOGIN',1,'2013-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(484,'2013-03-09 15:19:53','USER_LOGIN',1,'2013-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(495,'2013-03-09 18:06:21','USER_LOGIN',1,'2013-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(496,'2013-03-09 20:01:24','USER_LOGIN',1,'2013-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(497,'2013-03-09 23:36:45','USER_LOGIN',1,'2013-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(498,'2013-03-10 14:37:13','USER_LOGIN',1,'2013-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(499,'2013-03-10 17:54:12','USER_LOGIN',1,'2013-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(500,'2013-03-11 08:57:09','USER_LOGIN',1,'2013-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(501,'2013-03-11 22:05:13','USER_LOGIN',1,'2013-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(502,'2013-03-12 08:34:27','USER_LOGIN',1,'2013-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(503,'2013-03-13 09:11:02','USER_LOGIN',1,'2013-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(504,'2013-03-13 10:02:11','USER_LOGIN',1,'2013-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(505,'2013-03-13 13:20:58','USER_LOGIN',1,'2013-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(506,'2013-03-13 16:19:28','USER_LOGIN',1,'2013-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(507,'2013-03-13 18:34:30','USER_LOGIN',1,'2013-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(508,'2013-03-14 08:25:02','USER_LOGIN',1,'2013-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(509,'2013-03-14 19:15:22','USER_LOGIN',1,'2013-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(510,'2013-03-14 21:58:53','USER_LOGIN',1,'2013-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(511,'2013-03-14 21:58:59','USER_LOGOUT',1,'2013-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(512,'2013-03-14 21:59:07','USER_LOGIN',1,'2013-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(513,'2013-03-14 22:58:22','USER_LOGOUT',1,'2013-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(514,'2013-03-14 23:00:25','USER_LOGIN',1,'2013-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(515,'2013-03-16 12:14:28','USER_LOGIN',1,'2013-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(516,'2013-03-16 16:09:01','USER_LOGIN',1,'2013-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(517,'2013-03-16 16:57:11','USER_LOGIN',1,'2013-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(518,'2013-03-16 19:31:31','USER_LOGIN',1,'2013-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(519,'2013-03-17 17:44:39','USER_LOGIN',1,'2013-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(520,'2013-03-17 20:40:57','USER_LOGIN',1,'2013-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(521,'2013-03-17 23:14:05','USER_LOGIN',1,'2013-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(522,'2013-03-17 23:28:47','USER_LOGOUT',1,'2013-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(523,'2013-03-17 23:28:54','USER_LOGIN',1,'2013-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(524,'2013-03-18 17:37:30','USER_LOGIN',1,'2013-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(525,'2013-03-18 18:11:37','USER_LOGIN',1,'2013-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(526,'2013-03-19 08:35:08','USER_LOGIN',1,'2013-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(527,'2013-03-19 09:20:23','USER_LOGIN',1,'2013-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(528,'2013-03-20 13:17:13','USER_LOGIN',1,'2013-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(529,'2013-03-20 14:44:31','USER_LOGIN',1,'2013-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(530,'2013-03-20 18:24:25','USER_LOGIN',1,'2013-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(531,'2013-03-20 19:15:54','USER_LOGIN',1,'2013-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(532,'2013-03-21 18:40:47','USER_LOGIN',1,'2013-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(533,'2013-03-21 21:42:24','USER_LOGIN',1,'2013-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(534,'2013-03-22 08:39:23','USER_LOGIN',1,'2013-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(535,'2013-03-23 13:04:55','USER_LOGIN',1,'2013-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(536,'2013-03-23 15:47:43','USER_LOGIN',1,'2013-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(537,'2013-03-23 22:56:36','USER_LOGIN',1,'2013-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(538,'2013-03-24 01:22:32','USER_LOGIN',1,'2013-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(539,'2013-03-24 14:40:42','USER_LOGIN',1,'2013-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(540,'2013-03-24 15:30:26','USER_LOGOUT',1,'2013-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(541,'2013-03-24 15:30:29','USER_LOGIN',1,'2013-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(542,'2013-03-24 15:49:40','USER_LOGOUT',1,'2013-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(543,'2013-03-24 15:49:48','USER_LOGIN',1,'2013-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(544,'2013-03-24 15:52:35','USER_MODIFY',1,'2013-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(545,'2013-03-24 15:52:52','USER_MODIFY',1,'2013-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(546,'2013-03-24 15:53:09','USER_MODIFY',1,'2013-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(547,'2013-03-24 15:53:23','USER_MODIFY',1,'2013-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(548,'2013-03-24 16:00:04','USER_MODIFY',1,'2013-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(549,'2013-03-24 16:01:50','USER_MODIFY',1,'2013-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(550,'2013-03-24 16:10:14','USER_MODIFY',1,'2013-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(551,'2013-03-24 16:55:13','USER_LOGIN',1,'2013-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(552,'2013-03-24 17:44:29','USER_LOGIN',1,'2013-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(553,'2013-09-08 23:06:26','USER_LOGIN',1,'2013-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL),(554,'2013-10-21 22:32:28','USER_LOGIN',1,'2013-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(555,'2013-10-21 22:32:48','USER_LOGIN',1,'2013-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(556,'2013-11-07 00:01:51','USER_LOGIN',1,'2013-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL),(557,'2014-03-02 15:21:07','USER_LOGIN',1,'2014-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(558,'2014-03-02 15:36:53','USER_LOGIN',1,'2014-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(559,'2014-03-02 18:54:23','USER_LOGIN',1,'2014-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(560,'2014-03-02 19:11:17','USER_LOGIN',1,'2014-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(561,'2014-03-03 18:19:24','USER_LOGIN',1,'2014-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(562,'2014-12-21 12:51:38','USER_LOGIN',1,'2014-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(563,'2014-12-21 19:52:09','USER_LOGIN',1,'2014-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(566,'2015-10-03 08:49:43','USER_NEW_PASSWORD',1,'2015-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(567,'2015-10-03 08:49:43','USER_MODIFY',1,'2015-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(568,'2015-10-03 09:03:12','USER_MODIFY',1,'2015-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(569,'2015-10-03 09:03:42','USER_MODIFY',1,'2015-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(570,'2015-10-03 09:07:36','USER_MODIFY',1,'2015-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(571,'2015-10-03 09:08:58','USER_NEW_PASSWORD',1,'2015-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(572,'2015-10-03 09:08:58','USER_MODIFY',1,'2015-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(573,'2015-10-03 09:09:23','USER_MODIFY',1,'2015-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(574,'2015-10-03 09:11:04','USER_NEW_PASSWORD',1,'2015-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(575,'2015-10-03 09:11:04','USER_MODIFY',1,'2015-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(576,'2015-10-03 09:11:53','USER_MODIFY',1,'2015-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(577,'2015-10-03 09:42:12','USER_LOGIN_FAILED',1,'2015-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(578,'2015-10-03 09:42:19','USER_LOGIN_FAILED',1,'2015-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(579,'2015-10-03 09:42:42','USER_LOGIN_FAILED',1,'2015-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(580,'2015-10-03 09:43:50','USER_LOGIN',1,'2015-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(581,'2015-10-03 09:44:44','GROUP_MODIFY',1,'2015-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(582,'2015-10-03 09:46:25','GROUP_CREATE',1,'2015-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(583,'2015-10-03 09:46:46','GROUP_CREATE',1,'2015-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(584,'2015-10-03 09:47:41','USER_CREATE',1,'2015-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(585,'2015-10-03 09:47:41','USER_NEW_PASSWORD',1,'2015-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(586,'2015-10-03 09:47:53','USER_MODIFY',1,'2015-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(587,'2015-10-03 09:48:32','USER_DELETE',1,'2015-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(588,'2015-10-03 09:48:52','USER_MODIFY',1,'2015-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(589,'2015-10-03 10:01:28','USER_MODIFY',1,'2015-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(590,'2015-10-03 10:01:39','USER_MODIFY',1,'2015-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL);
+INSERT INTO `llx_events` VALUES (30,'2011-07-18 18:23:06','USER_LOGOUT',1,'2011-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(31,'2011-07-18 18:23:12','USER_LOGIN_FAILED',1,'2011-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(32,'2011-07-18 18:23:17','USER_LOGIN',1,'2011-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(33,'2011-07-18 20:10:51','USER_LOGIN_FAILED',1,'2011-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(34,'2011-07-18 20:10:55','USER_LOGIN',1,'2011-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(35,'2011-07-18 21:18:57','USER_LOGIN',1,'2011-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(36,'2011-07-20 10:34:10','USER_LOGIN',1,'2011-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(37,'2011-07-20 12:36:44','USER_LOGIN',1,'2011-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(38,'2011-07-20 13:20:51','USER_LOGIN_FAILED',1,'2011-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(39,'2011-07-20 13:20:54','USER_LOGIN',1,'2011-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(40,'2011-07-20 15:03:46','USER_LOGIN_FAILED',1,'2011-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(41,'2011-07-20 15:03:55','USER_LOGIN',1,'2011-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(42,'2011-07-20 18:05:05','USER_LOGIN_FAILED',1,'2011-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(43,'2011-07-20 18:05:08','USER_LOGIN',1,'2011-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(44,'2011-07-20 21:08:53','USER_LOGIN_FAILED',1,'2011-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(45,'2011-07-20 21:08:56','USER_LOGIN',1,'2011-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(46,'2011-07-21 01:26:12','USER_LOGIN',1,'2011-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(47,'2011-07-21 22:35:45','USER_LOGIN_FAILED',1,'2011-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(48,'2011-07-21 22:35:49','USER_LOGIN',1,'2011-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(49,'2011-07-26 23:09:47','USER_LOGIN_FAILED',1,'2011-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(50,'2011-07-26 23:09:50','USER_LOGIN',1,'2011-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(51,'2011-07-27 17:02:27','USER_LOGIN_FAILED',1,'2011-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(52,'2011-07-27 17:02:32','USER_LOGIN',1,'2011-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(53,'2011-07-27 23:33:37','USER_LOGIN_FAILED',1,'2011-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(54,'2011-07-27 23:33:41','USER_LOGIN',1,'2011-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(55,'2011-07-28 18:20:36','USER_LOGIN_FAILED',1,'2011-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(56,'2011-07-28 18:20:38','USER_LOGIN',1,'2011-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(57,'2011-07-28 20:13:30','USER_LOGIN_FAILED',1,'2011-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(58,'2011-07-28 20:13:34','USER_LOGIN',1,'2011-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(59,'2011-07-28 20:22:51','USER_LOGIN',1,'2011-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(60,'2011-07-28 23:05:06','USER_LOGIN',1,'2011-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(61,'2011-07-29 20:15:50','USER_LOGIN_FAILED',1,'2011-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(62,'2011-07-29 20:15:53','USER_LOGIN',1,'2011-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(68,'2011-07-29 20:51:01','USER_LOGOUT',1,'2011-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(69,'2011-07-29 20:51:05','USER_LOGIN',1,'2011-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(70,'2011-07-30 08:46:20','USER_LOGIN_FAILED',1,'2011-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(71,'2011-07-30 08:46:38','USER_LOGIN_FAILED',1,'2011-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(72,'2011-07-30 08:46:42','USER_LOGIN',1,'2011-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(73,'2011-07-30 10:05:12','USER_LOGIN_FAILED',1,'2011-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(74,'2011-07-30 10:05:15','USER_LOGIN',1,'2011-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(75,'2011-07-30 12:15:46','USER_LOGIN',1,'2011-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(76,'2011-07-31 22:19:30','USER_LOGIN',1,'2011-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(77,'2011-07-31 23:32:52','USER_LOGIN',1,'2011-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(78,'2011-08-01 01:24:50','USER_LOGIN_FAILED',1,'2011-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(79,'2011-08-01 01:24:54','USER_LOGIN',1,'2011-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(80,'2011-08-01 19:31:36','USER_LOGIN_FAILED',1,'2011-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(81,'2011-08-01 19:31:39','USER_LOGIN',1,'2011-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(82,'2011-08-01 20:01:36','USER_LOGIN',1,'2011-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(83,'2011-08-01 20:52:54','USER_LOGIN_FAILED',1,'2011-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(84,'2011-08-01 20:52:58','USER_LOGIN',1,'2011-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(85,'2011-08-01 21:17:28','USER_LOGIN_FAILED',1,'2011-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(86,'2011-08-01 21:17:31','USER_LOGIN',1,'2011-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(87,'2011-08-04 11:55:17','USER_LOGIN',1,'2011-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(88,'2011-08-04 20:19:03','USER_LOGIN_FAILED',1,'2011-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(89,'2011-08-04 20:19:07','USER_LOGIN',1,'2011-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(90,'2011-08-05 17:51:42','USER_LOGIN_FAILED',1,'2011-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(91,'2011-08-05 17:51:47','USER_LOGIN',1,'2011-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(92,'2011-08-05 17:56:03','USER_LOGIN',1,'2011-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(93,'2011-08-05 17:59:10','USER_LOGIN',1,'2011-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(94,'2011-08-05 18:01:58','USER_LOGIN',1,'2011-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL),(95,'2011-08-05 19:59:56','USER_LOGIN',1,'2011-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(96,'2011-08-06 18:33:22','USER_LOGIN',1,'2011-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(97,'2011-08-07 00:56:59','USER_LOGIN',1,'2011-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(98,'2011-08-07 22:49:14','USER_LOGIN',1,'2011-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(99,'2011-08-07 23:05:18','USER_LOGOUT',1,'2011-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(105,'2011-08-08 00:41:09','USER_LOGIN',1,'2011-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(106,'2011-08-08 11:58:55','USER_LOGIN',1,'2011-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(107,'2011-08-08 14:35:48','USER_LOGIN',1,'2011-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(108,'2011-08-08 14:36:31','USER_LOGOUT',1,'2011-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(109,'2011-08-08 14:38:28','USER_LOGIN',1,'2011-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(110,'2011-08-08 14:39:02','USER_LOGOUT',1,'2011-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(111,'2011-08-08 14:39:10','USER_LOGIN',1,'2011-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(112,'2011-08-08 14:39:28','USER_LOGOUT',1,'2011-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(113,'2011-08-08 14:39:37','USER_LOGIN',1,'2011-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(114,'2011-08-08 14:50:02','USER_LOGOUT',1,'2011-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(115,'2011-08-08 14:51:45','USER_LOGIN_FAILED',1,'2011-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(116,'2011-08-08 14:51:52','USER_LOGIN',1,'2011-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(117,'2011-08-08 15:09:54','USER_LOGOUT',1,'2011-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(118,'2011-08-08 15:10:19','USER_LOGIN_FAILED',1,'2011-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(119,'2011-08-08 15:10:28','USER_LOGIN',1,'2011-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(121,'2011-08-08 15:14:58','USER_LOGOUT',1,'2011-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(122,'2011-08-08 15:15:00','USER_LOGIN_FAILED',1,'2011-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(123,'2011-08-08 15:17:57','USER_LOGIN',1,'2011-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(124,'2011-08-08 15:35:56','USER_LOGOUT',1,'2011-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(125,'2011-08-08 15:36:05','USER_LOGIN',1,'2011-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(126,'2011-08-08 17:32:42','USER_LOGIN',1,'2011-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL),(127,'2012-12-08 13:49:37','USER_LOGOUT',1,'2012-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(128,'2012-12-08 13:49:42','USER_LOGIN',1,'2012-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(129,'2012-12-08 13:50:12','USER_LOGOUT',1,'2012-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(130,'2012-12-08 13:50:14','USER_LOGIN',1,'2012-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(131,'2012-12-08 13:50:17','USER_LOGOUT',1,'2012-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(132,'2012-12-08 13:52:47','USER_LOGIN',1,'2012-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(133,'2012-12-08 13:53:08','USER_MODIFY',1,'2012-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(134,'2012-12-08 14:08:45','USER_LOGOUT',1,'2012-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(135,'2012-12-08 14:09:09','USER_LOGIN',1,'2012-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(136,'2012-12-08 14:11:43','USER_LOGOUT',1,'2012-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(137,'2012-12-08 14:11:45','USER_LOGIN',1,'2012-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(138,'2012-12-08 14:22:53','USER_LOGOUT',1,'2012-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(139,'2012-12-08 14:22:54','USER_LOGIN',1,'2012-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(140,'2012-12-08 14:23:10','USER_LOGOUT',1,'2012-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(141,'2012-12-08 14:23:11','USER_LOGIN',1,'2012-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(142,'2012-12-08 14:23:49','USER_LOGOUT',1,'2012-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(143,'2012-12-08 14:23:50','USER_LOGIN',1,'2012-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(144,'2012-12-08 14:28:08','USER_LOGOUT',1,'2012-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(145,'2012-12-08 14:35:15','USER_LOGIN',1,'2012-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(146,'2012-12-08 14:35:18','USER_LOGOUT',1,'2012-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(147,'2012-12-08 14:36:07','USER_LOGIN',1,'2012-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(148,'2012-12-08 14:36:09','USER_LOGOUT',1,'2012-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(149,'2012-12-08 14:36:41','USER_LOGIN',1,'2012-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(150,'2012-12-08 15:59:13','USER_LOGIN',1,'2012-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(151,'2012-12-09 11:49:52','USER_LOGIN',1,'2012-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(152,'2012-12-09 13:46:31','USER_LOGIN',1,'2012-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(153,'2012-12-09 19:03:14','USER_LOGIN',1,'2012-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(154,'2012-12-10 00:16:31','USER_LOGIN',1,'2012-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(170,'2012-12-11 22:03:31','USER_LOGIN',1,'2012-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(171,'2012-12-12 00:32:39','USER_LOGIN',1,'2012-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(172,'2012-12-12 10:49:59','USER_LOGIN',1,'2012-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(175,'2012-12-12 10:57:40','USER_MODIFY',1,'2012-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(176,'2012-12-12 13:29:15','USER_LOGIN',1,'2012-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(177,'2012-12-12 13:30:15','USER_LOGIN',1,'2012-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(178,'2012-12-12 13:40:08','USER_LOGOUT',1,'2012-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(179,'2012-12-12 13:40:10','USER_LOGIN',1,'2012-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(180,'2012-12-12 13:40:26','USER_MODIFY',1,'2012-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(181,'2012-12-12 13:40:34','USER_LOGOUT',1,'2012-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(182,'2012-12-12 13:42:23','USER_LOGIN',1,'2012-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(183,'2012-12-12 13:43:02','USER_NEW_PASSWORD',1,'2012-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(184,'2012-12-12 13:43:25','USER_LOGOUT',1,'2012-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(185,'2012-12-12 13:43:27','USER_LOGIN_FAILED',1,'2012-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(186,'2012-12-12 13:43:30','USER_LOGIN',1,'2012-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(187,'2012-12-12 14:52:11','USER_LOGIN',1,'2012-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL),(188,'2012-12-12 17:53:00','USER_LOGIN_FAILED',1,'2012-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(189,'2012-12-12 17:53:07','USER_LOGIN_FAILED',1,'2012-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(190,'2012-12-12 17:53:51','USER_NEW_PASSWORD',1,'2012-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(191,'2012-12-12 17:54:00','USER_LOGIN',1,'2012-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(192,'2012-12-12 17:54:10','USER_NEW_PASSWORD',1,'2012-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(193,'2012-12-12 17:54:10','USER_MODIFY',1,'2012-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(194,'2012-12-12 18:57:09','USER_LOGIN',1,'2012-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(195,'2012-12-12 23:04:08','USER_LOGIN',1,'2012-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(196,'2012-12-17 20:03:14','USER_LOGIN',1,'2012-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(197,'2012-12-17 21:18:45','USER_LOGIN',1,'2012-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(198,'2012-12-17 22:30:08','USER_LOGIN',1,'2012-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(199,'2012-12-18 23:32:03','USER_LOGIN',1,'2012-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(200,'2012-12-19 09:38:03','USER_LOGIN',1,'2012-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(201,'2012-12-19 11:23:35','USER_LOGIN',1,'2012-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(202,'2012-12-19 12:46:22','USER_LOGIN',1,'2012-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(214,'2012-12-19 19:11:31','USER_LOGIN',1,'2012-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(215,'2012-12-21 16:36:57','USER_LOGIN',1,'2012-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(216,'2012-12-21 16:38:43','USER_NEW_PASSWORD',1,'2012-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(217,'2012-12-21 16:38:43','USER_MODIFY',1,'2012-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(218,'2012-12-21 16:38:51','USER_LOGOUT',1,'2012-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(219,'2012-12-21 16:38:55','USER_LOGIN',1,'2012-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(220,'2012-12-21 16:48:18','USER_LOGOUT',1,'2012-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(221,'2012-12-21 16:48:20','USER_LOGIN',1,'2012-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(222,'2012-12-26 18:28:18','USER_LOGIN',1,'2012-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(223,'2012-12-26 20:00:24','USER_LOGIN',1,'2012-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(224,'2012-12-27 01:10:27','USER_LOGIN',1,'2012-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(225,'2012-12-28 19:12:08','USER_LOGIN',1,'2012-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(226,'2012-12-28 20:16:58','USER_LOGIN',1,'2012-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(227,'2012-12-29 14:35:46','USER_LOGIN',1,'2012-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(228,'2012-12-29 14:37:59','USER_LOGOUT',1,'2012-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(229,'2012-12-29 14:38:00','USER_LOGIN',1,'2012-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(230,'2012-12-29 17:16:48','USER_LOGIN',1,'2012-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(231,'2012-12-31 12:02:59','USER_LOGIN',1,'2012-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(232,'2013-01-02 20:32:51','USER_LOGIN',1,'2013-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL),(233,'2013-01-02 20:58:59','USER_LOGIN',1,'2013-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(234,'2013-01-03 09:25:07','USER_LOGIN',1,'2013-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(235,'2013-01-03 19:39:31','USER_LOGIN',1,'2013-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(236,'2013-01-04 22:40:19','USER_LOGIN',1,'2013-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(237,'2013-01-05 12:59:59','USER_LOGIN',1,'2013-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(238,'2013-01-05 15:28:52','USER_LOGIN',1,'2013-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(239,'2013-01-05 17:02:08','USER_LOGIN',1,'2013-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(240,'2013-01-06 12:13:33','USER_LOGIN',1,'2013-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(241,'2013-01-07 01:21:15','USER_LOGIN',1,'2013-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(242,'2013-01-07 01:46:31','USER_LOGOUT',1,'2013-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(243,'2013-01-07 19:54:50','USER_LOGIN',1,'2013-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(244,'2013-01-08 21:55:01','USER_LOGIN',1,'2013-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(245,'2013-01-09 11:13:28','USER_LOGIN',1,'2013-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(246,'2013-01-10 18:30:46','USER_LOGIN',1,'2013-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(247,'2013-01-11 18:03:26','USER_LOGIN',1,'2013-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(248,'2013-01-12 11:15:04','USER_LOGIN',1,'2013-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(249,'2013-01-12 14:42:44','USER_LOGIN',1,'2013-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(250,'2013-01-13 12:07:17','USER_LOGIN',1,'2013-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(251,'2013-01-13 17:37:58','USER_LOGIN',1,'2013-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(252,'2013-01-13 19:24:21','USER_LOGIN',1,'2013-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(253,'2013-01-13 19:29:19','USER_LOGOUT',1,'2013-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(254,'2013-01-13 21:39:39','USER_LOGIN',1,'2013-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(255,'2013-01-14 00:52:21','USER_LOGIN',1,'2013-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL),(256,'2013-01-16 11:34:31','USER_LOGIN',1,'2013-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(257,'2013-01-16 15:36:21','USER_LOGIN',1,'2013-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(258,'2013-01-16 19:17:36','USER_LOGIN',1,'2013-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(259,'2013-01-16 19:48:08','GROUP_CREATE',1,'2013-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(260,'2013-01-16 21:48:53','USER_LOGIN',1,'2013-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(261,'2013-01-17 19:55:53','USER_LOGIN',1,'2013-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(262,'2013-01-18 09:48:01','USER_LOGIN',1,'2013-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(263,'2013-01-18 13:22:36','USER_LOGIN',1,'2013-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(264,'2013-01-18 16:10:23','USER_LOGIN',1,'2013-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(265,'2013-01-18 17:41:40','USER_LOGIN',1,'2013-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(266,'2013-01-19 14:33:48','USER_LOGIN',1,'2013-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(267,'2013-01-19 16:47:43','USER_LOGIN',1,'2013-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(268,'2013-01-19 16:59:43','USER_LOGIN',1,'2013-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(269,'2013-01-19 17:00:22','USER_LOGIN',1,'2013-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(270,'2013-01-19 17:04:16','USER_LOGOUT',1,'2013-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(271,'2013-01-19 17:04:18','USER_LOGIN',1,'2013-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(272,'2013-01-20 00:34:19','USER_LOGIN',1,'2013-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(273,'2013-01-21 11:54:17','USER_LOGIN',1,'2013-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(274,'2013-01-21 13:48:15','USER_LOGIN',1,'2013-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(275,'2013-01-21 14:30:22','USER_LOGIN',1,'2013-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(276,'2013-01-21 15:10:46','USER_LOGIN',1,'2013-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(277,'2013-01-21 17:27:43','USER_LOGIN',1,'2013-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(278,'2013-01-21 21:48:15','USER_LOGIN',1,'2013-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(279,'2013-01-21 21:50:42','USER_LOGIN',1,'2013-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL),(280,'2013-01-23 09:28:26','USER_LOGIN',1,'2013-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(281,'2013-01-23 13:21:57','USER_LOGIN',1,'2013-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(282,'2013-01-23 16:52:00','USER_LOGOUT',1,'2013-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(283,'2013-01-23 16:52:05','USER_LOGIN_FAILED',1,'2013-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(284,'2013-01-23 16:52:09','USER_LOGIN',1,'2013-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(285,'2013-01-23 16:52:27','USER_CREATE',1,'2013-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(286,'2013-01-23 16:52:27','USER_NEW_PASSWORD',1,'2013-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(287,'2013-01-23 16:52:37','USER_CREATE',1,'2013-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(288,'2013-01-23 16:52:37','USER_NEW_PASSWORD',1,'2013-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(289,'2013-01-23 16:53:15','USER_LOGOUT',1,'2013-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(290,'2013-01-23 16:53:20','USER_LOGIN',1,'2013-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(291,'2013-01-23 19:16:58','USER_LOGIN',1,'2013-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(292,'2013-01-26 10:54:07','USER_LOGIN',1,'2013-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(293,'2013-01-29 10:15:36','USER_LOGIN',1,'2013-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(294,'2013-01-30 17:42:50','USER_LOGIN',1,'2013-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL),(295,'2013-02-01 08:49:55','USER_LOGIN',1,'2013-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(296,'2013-02-01 08:51:57','USER_LOGOUT',1,'2013-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(297,'2013-02-01 08:52:39','USER_LOGIN',1,'2013-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(298,'2013-02-01 21:03:01','USER_LOGIN',1,'2013-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(299,'2013-02-10 19:48:39','USER_LOGIN',1,'2013-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(300,'2013-02-10 20:46:48','USER_LOGIN',1,'2013-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(301,'2013-02-10 21:39:23','USER_LOGIN',1,'2013-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(302,'2013-02-11 19:00:13','USER_LOGIN',1,'2013-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(303,'2013-02-11 19:43:44','USER_LOGIN_FAILED',1,'2013-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(304,'2013-02-11 19:44:01','USER_LOGIN',1,'2013-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(305,'2013-02-12 00:27:35','USER_LOGIN',1,'2013-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(306,'2013-02-12 00:27:38','USER_LOGOUT',1,'2013-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(307,'2013-02-12 00:28:07','USER_LOGIN',1,'2013-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(308,'2013-02-12 00:28:09','USER_LOGOUT',1,'2013-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(309,'2013-02-12 00:28:26','USER_LOGIN',1,'2013-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(310,'2013-02-12 00:28:30','USER_LOGOUT',1,'2013-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(311,'2013-02-12 12:42:15','USER_LOGIN',1,'2013-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL),(312,'2013-02-12 13:46:16','USER_LOGIN',1,'2013-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(313,'2013-02-12 14:54:28','USER_LOGIN',1,'2013-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(314,'2013-02-12 16:04:46','USER_LOGIN',1,'2013-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(315,'2013-02-13 14:02:43','USER_LOGIN',1,'2013-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(316,'2013-02-13 14:48:30','USER_LOGIN',1,'2013-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(317,'2013-02-13 17:44:53','USER_LOGIN',1,'2013-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(318,'2013-02-15 08:44:36','USER_LOGIN',1,'2013-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(319,'2013-02-15 08:53:20','USER_LOGIN',1,'2013-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(320,'2013-02-16 19:10:28','USER_LOGIN',1,'2013-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(321,'2013-02-16 19:22:40','USER_CREATE',1,'2013-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(322,'2013-02-16 19:22:40','USER_NEW_PASSWORD',1,'2013-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(323,'2013-02-16 19:48:15','USER_CREATE',1,'2013-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(324,'2013-02-16 19:48:15','USER_NEW_PASSWORD',1,'2013-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(325,'2013-02-16 19:50:08','USER_CREATE',1,'2013-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(326,'2013-02-16 19:50:08','USER_NEW_PASSWORD',1,'2013-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(327,'2013-02-16 21:20:03','USER_LOGIN',1,'2013-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(328,'2013-02-17 14:30:51','USER_LOGIN',1,'2013-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(329,'2013-02-17 17:21:22','USER_LOGIN',1,'2013-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(330,'2013-02-17 17:48:43','USER_MODIFY',1,'2013-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(331,'2013-02-17 17:48:47','USER_MODIFY',1,'2013-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(332,'2013-02-17 17:48:51','USER_MODIFY',1,'2013-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(333,'2013-02-17 17:48:56','USER_MODIFY',1,'2013-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(334,'2013-02-18 22:00:01','USER_LOGIN',1,'2013-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(335,'2013-02-19 08:19:52','USER_LOGIN',1,'2013-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(336,'2013-02-19 22:00:52','USER_LOGIN',1,'2013-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(337,'2013-02-20 09:34:52','USER_LOGIN',1,'2013-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(338,'2013-02-20 13:12:28','USER_LOGIN',1,'2013-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(339,'2013-02-20 17:19:44','USER_LOGIN',1,'2013-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(340,'2013-02-20 19:07:21','USER_MODIFY',1,'2013-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(341,'2013-02-20 19:47:17','USER_LOGIN',1,'2013-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(342,'2013-02-20 19:48:01','USER_MODIFY',1,'2013-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(343,'2013-02-21 08:27:07','USER_LOGIN',1,'2013-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(344,'2013-02-23 13:34:13','USER_LOGIN',1,'2013-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL),(345,'2013-02-24 01:06:41','USER_LOGIN_FAILED',1,'2013-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(346,'2013-02-24 01:06:45','USER_LOGIN_FAILED',1,'2013-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(347,'2013-02-24 01:06:55','USER_LOGIN_FAILED',1,'2013-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(348,'2013-02-24 01:07:03','USER_LOGIN_FAILED',1,'2013-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(349,'2013-02-24 01:07:21','USER_LOGIN_FAILED',1,'2013-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(350,'2013-02-24 01:08:12','USER_LOGIN_FAILED',1,'2013-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(351,'2013-02-24 01:08:42','USER_LOGIN_FAILED',1,'2013-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(352,'2013-02-24 01:08:50','USER_LOGIN_FAILED',1,'2013-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(353,'2013-02-24 01:09:08','USER_LOGIN_FAILED',1,'2013-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(354,'2013-02-24 01:09:42','USER_LOGIN_FAILED',1,'2013-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(355,'2013-02-24 01:09:50','USER_LOGIN_FAILED',1,'2013-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(356,'2013-02-24 01:10:05','USER_LOGIN_FAILED',1,'2013-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(357,'2013-02-24 01:10:22','USER_LOGIN_FAILED',1,'2013-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(358,'2013-02-24 01:10:30','USER_LOGIN_FAILED',1,'2013-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(359,'2013-02-24 01:10:56','USER_LOGIN_FAILED',1,'2013-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(360,'2013-02-24 01:11:26','USER_LOGIN_FAILED',1,'2013-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(361,'2013-02-24 01:12:06','USER_LOGIN_FAILED',1,'2013-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(362,'2013-02-24 01:21:14','USER_LOGIN_FAILED',1,'2013-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(363,'2013-02-24 01:21:25','USER_LOGIN_FAILED',1,'2013-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(364,'2013-02-24 01:21:54','USER_LOGIN_FAILED',1,'2013-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(365,'2013-02-24 01:22:14','USER_LOGIN_FAILED',1,'2013-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(366,'2013-02-24 01:22:37','USER_LOGIN_FAILED',1,'2013-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(367,'2013-02-24 01:23:01','USER_LOGIN_FAILED',1,'2013-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(368,'2013-02-24 01:23:39','USER_LOGIN_FAILED',1,'2013-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(369,'2013-02-24 01:24:04','USER_LOGIN_FAILED',1,'2013-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(370,'2013-02-24 01:24:39','USER_LOGIN_FAILED',1,'2013-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(371,'2013-02-24 01:25:01','USER_LOGIN_FAILED',1,'2013-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(372,'2013-02-24 01:25:12','USER_LOGIN_FAILED',1,'2013-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(373,'2013-02-24 01:27:30','USER_LOGIN_FAILED',1,'2013-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(374,'2013-02-24 01:28:00','USER_LOGIN_FAILED',1,'2013-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(375,'2013-02-24 01:28:35','USER_LOGIN_FAILED',1,'2013-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(376,'2013-02-24 01:29:03','USER_LOGIN_FAILED',1,'2013-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(377,'2013-02-24 01:29:55','USER_LOGIN_FAILED',1,'2013-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(378,'2013-02-24 01:32:40','USER_LOGIN_FAILED',1,'2013-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(379,'2013-02-24 01:39:33','USER_LOGIN_FAILED',1,'2013-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(380,'2013-02-24 01:39:38','USER_LOGIN_FAILED',1,'2013-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(381,'2013-02-24 01:39:47','USER_LOGIN_FAILED',1,'2013-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(382,'2013-02-24 01:40:54','USER_LOGIN_FAILED',1,'2013-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(383,'2013-02-24 01:47:57','USER_LOGIN_FAILED',1,'2013-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(384,'2013-02-24 01:48:05','USER_LOGIN_FAILED',1,'2013-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(385,'2013-02-24 01:48:07','USER_LOGIN_FAILED',1,'2013-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(386,'2013-02-24 01:48:35','USER_LOGIN',1,'2013-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(387,'2013-02-24 01:56:32','USER_LOGIN',1,'2013-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(388,'2013-02-24 02:05:55','USER_LOGOUT',1,'2013-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(389,'2013-02-24 02:39:52','USER_LOGIN',1,'2013-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(390,'2013-02-24 02:51:10','USER_LOGOUT',1,'2013-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(391,'2013-02-24 12:46:41','USER_LOGIN',1,'2013-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(392,'2013-02-24 12:46:52','USER_LOGOUT',1,'2013-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(393,'2013-02-24 12:46:56','USER_LOGIN',1,'2013-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(394,'2013-02-24 12:47:56','USER_LOGOUT',1,'2013-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(395,'2013-02-24 12:48:00','USER_LOGIN',1,'2013-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(396,'2013-02-24 12:48:11','USER_LOGOUT',1,'2013-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(397,'2013-02-24 12:48:32','USER_LOGIN',1,'2013-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(398,'2013-02-24 12:52:22','USER_LOGOUT',1,'2013-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(399,'2013-02-24 12:52:27','USER_LOGIN',1,'2013-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(400,'2013-02-24 12:52:54','USER_LOGOUT',1,'2013-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(401,'2013-02-24 12:52:59','USER_LOGIN',1,'2013-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(402,'2013-02-24 12:55:39','USER_LOGOUT',1,'2013-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(403,'2013-02-24 12:55:59','USER_LOGIN',1,'2013-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(404,'2013-02-24 12:56:07','USER_LOGOUT',1,'2013-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(405,'2013-02-24 12:56:23','USER_LOGIN',1,'2013-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(406,'2013-02-24 12:56:46','USER_LOGOUT',1,'2013-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(407,'2013-02-24 12:58:30','USER_LOGIN',1,'2013-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(408,'2013-02-24 12:58:33','USER_LOGOUT',1,'2013-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(409,'2013-02-24 12:58:51','USER_LOGIN',1,'2013-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(410,'2013-02-24 12:58:58','USER_LOGOUT',1,'2013-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(411,'2013-02-24 13:18:53','USER_LOGIN',1,'2013-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(412,'2013-02-24 13:19:52','USER_LOGOUT',1,'2013-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(413,'2013-02-24 15:39:31','USER_LOGIN_FAILED',1,'2013-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL),(414,'2013-02-24 15:42:07','USER_LOGIN',1,'2013-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL),(415,'2013-02-24 15:42:52','USER_LOGOUT',1,'2013-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(416,'2013-02-24 16:04:21','USER_LOGIN',1,'2013-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(417,'2013-02-24 16:11:28','USER_LOGIN_FAILED',1,'2013-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(418,'2013-02-24 16:11:37','USER_LOGIN',1,'2013-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(419,'2013-02-24 16:36:52','USER_LOGOUT',1,'2013-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL),(420,'2013-02-24 16:40:37','USER_LOGIN',1,'2013-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(421,'2013-02-24 16:57:16','USER_LOGIN',1,'2013-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(422,'2013-02-24 17:01:30','USER_LOGOUT',1,'2013-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(423,'2013-02-24 17:02:33','USER_LOGIN',1,'2013-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(424,'2013-02-24 17:14:22','USER_LOGOUT',1,'2013-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(425,'2013-02-24 17:15:07','USER_LOGIN_FAILED',1,'2013-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(426,'2013-02-24 17:15:20','USER_LOGIN',1,'2013-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(427,'2013-02-24 17:20:14','USER_LOGIN',1,'2013-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(428,'2013-02-24 17:20:51','USER_LOGIN',1,'2013-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(429,'2013-02-24 17:20:54','USER_LOGOUT',1,'2013-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(430,'2013-02-24 17:21:19','USER_LOGIN',1,'2013-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(431,'2013-02-24 17:32:35','USER_LOGIN',1,'2013-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL),(432,'2013-02-24 18:28:48','USER_LOGIN',1,'2013-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(433,'2013-02-24 18:29:27','USER_LOGOUT',1,'2013-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(434,'2013-02-24 18:29:32','USER_LOGIN',1,'2013-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL),(435,'2013-02-24 20:13:13','USER_LOGOUT',1,'2013-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(436,'2013-02-24 20:13:17','USER_LOGIN',1,'2013-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(437,'2013-02-25 08:57:16','USER_LOGIN',1,'2013-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(438,'2013-02-25 08:57:59','USER_LOGOUT',1,'2013-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(439,'2013-02-25 09:15:02','USER_LOGIN',1,'2013-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(440,'2013-02-25 09:15:50','USER_LOGOUT',1,'2013-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(441,'2013-02-25 09:15:57','USER_LOGIN',1,'2013-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(442,'2013-02-25 09:16:12','USER_LOGOUT',1,'2013-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(443,'2013-02-25 09:16:19','USER_LOGIN',1,'2013-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(444,'2013-02-25 09:16:25','USER_LOGOUT',1,'2013-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(445,'2013-02-25 09:16:39','USER_LOGIN_FAILED',1,'2013-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(446,'2013-02-25 09:16:42','USER_LOGIN_FAILED',1,'2013-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(447,'2013-02-25 09:16:54','USER_LOGIN_FAILED',1,'2013-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(448,'2013-02-25 09:17:53','USER_LOGIN',1,'2013-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(449,'2013-02-25 09:18:37','USER_LOGOUT',1,'2013-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(450,'2013-02-25 09:18:41','USER_LOGIN',1,'2013-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(451,'2013-02-25 09:18:47','USER_LOGOUT',1,'2013-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(452,'2013-02-25 10:05:34','USER_LOGIN',1,'2013-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(453,'2013-02-26 21:51:40','USER_LOGIN',1,'2013-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(454,'2013-02-26 23:30:06','USER_LOGIN',1,'2013-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(455,'2013-02-27 14:13:11','USER_LOGIN',1,'2013-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(456,'2013-02-27 18:12:06','USER_LOGIN_FAILED',1,'2013-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(457,'2013-02-27 18:12:10','USER_LOGIN',1,'2013-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(458,'2013-02-27 20:20:08','USER_LOGIN',1,'2013-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(459,'2013-03-01 22:12:03','USER_LOGIN',1,'2013-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(460,'2013-03-02 11:45:50','USER_LOGIN',1,'2013-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(461,'2013-03-02 15:53:51','USER_LOGIN_FAILED',1,'2013-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(462,'2013-03-02 15:53:53','USER_LOGIN',1,'2013-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(463,'2013-03-02 18:32:32','USER_LOGIN',1,'2013-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(464,'2013-03-02 22:59:36','USER_LOGIN',1,'2013-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(465,'2013-03-03 16:26:26','USER_LOGIN',1,'2013-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(466,'2013-03-03 22:50:27','USER_LOGIN',1,'2013-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(467,'2013-03-04 08:29:27','USER_LOGIN',1,'2013-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(468,'2013-03-04 18:27:28','USER_LOGIN',1,'2013-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL),(469,'2013-03-04 19:27:23','USER_LOGIN',1,'2013-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL),(470,'2013-03-04 19:35:14','USER_LOGIN',1,'2013-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(471,'2013-03-04 19:55:49','USER_LOGIN',1,'2013-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL),(472,'2013-03-04 21:16:13','USER_LOGIN',1,'2013-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(473,'2013-03-05 10:17:30','USER_LOGIN',1,'2013-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(474,'2013-03-05 11:02:43','USER_LOGIN',1,'2013-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(475,'2013-03-05 23:14:39','USER_LOGIN',1,'2013-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(476,'2013-03-06 08:58:57','USER_LOGIN',1,'2013-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(477,'2013-03-06 14:29:40','USER_LOGIN',1,'2013-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(478,'2013-03-06 21:53:02','USER_LOGIN',1,'2013-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(479,'2013-03-07 21:14:39','USER_LOGIN',1,'2013-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(480,'2013-03-08 00:06:05','USER_LOGIN',1,'2013-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(481,'2013-03-08 01:38:13','USER_LOGIN',1,'2013-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(482,'2013-03-08 08:59:50','USER_LOGIN',1,'2013-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(483,'2013-03-09 12:08:51','USER_LOGIN',1,'2013-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(484,'2013-03-09 15:19:53','USER_LOGIN',1,'2013-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(495,'2013-03-09 18:06:21','USER_LOGIN',1,'2013-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(496,'2013-03-09 20:01:24','USER_LOGIN',1,'2013-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(497,'2013-03-09 23:36:45','USER_LOGIN',1,'2013-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(498,'2013-03-10 14:37:13','USER_LOGIN',1,'2013-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(499,'2013-03-10 17:54:12','USER_LOGIN',1,'2013-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(500,'2013-03-11 08:57:09','USER_LOGIN',1,'2013-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(501,'2013-03-11 22:05:13','USER_LOGIN',1,'2013-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(502,'2013-03-12 08:34:27','USER_LOGIN',1,'2013-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(503,'2013-03-13 09:11:02','USER_LOGIN',1,'2013-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(504,'2013-03-13 10:02:11','USER_LOGIN',1,'2013-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(505,'2013-03-13 13:20:58','USER_LOGIN',1,'2013-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(506,'2013-03-13 16:19:28','USER_LOGIN',1,'2013-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(507,'2013-03-13 18:34:30','USER_LOGIN',1,'2013-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(508,'2013-03-14 08:25:02','USER_LOGIN',1,'2013-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(509,'2013-03-14 19:15:22','USER_LOGIN',1,'2013-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(510,'2013-03-14 21:58:53','USER_LOGIN',1,'2013-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(511,'2013-03-14 21:58:59','USER_LOGOUT',1,'2013-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(512,'2013-03-14 21:59:07','USER_LOGIN',1,'2013-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(513,'2013-03-14 22:58:22','USER_LOGOUT',1,'2013-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(514,'2013-03-14 23:00:25','USER_LOGIN',1,'2013-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(515,'2013-03-16 12:14:28','USER_LOGIN',1,'2013-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(516,'2013-03-16 16:09:01','USER_LOGIN',1,'2013-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(517,'2013-03-16 16:57:11','USER_LOGIN',1,'2013-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(518,'2013-03-16 19:31:31','USER_LOGIN',1,'2013-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL),(519,'2013-03-17 17:44:39','USER_LOGIN',1,'2013-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(520,'2013-03-17 20:40:57','USER_LOGIN',1,'2013-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(521,'2013-03-17 23:14:05','USER_LOGIN',1,'2013-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(522,'2013-03-17 23:28:47','USER_LOGOUT',1,'2013-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(523,'2013-03-17 23:28:54','USER_LOGIN',1,'2013-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(524,'2013-03-18 17:37:30','USER_LOGIN',1,'2013-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(525,'2013-03-18 18:11:37','USER_LOGIN',1,'2013-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(526,'2013-03-19 08:35:08','USER_LOGIN',1,'2013-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(527,'2013-03-19 09:20:23','USER_LOGIN',1,'2013-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(528,'2013-03-20 13:17:13','USER_LOGIN',1,'2013-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(529,'2013-03-20 14:44:31','USER_LOGIN',1,'2013-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(530,'2013-03-20 18:24:25','USER_LOGIN',1,'2013-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(531,'2013-03-20 19:15:54','USER_LOGIN',1,'2013-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(532,'2013-03-21 18:40:47','USER_LOGIN',1,'2013-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(533,'2013-03-21 21:42:24','USER_LOGIN',1,'2013-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(534,'2013-03-22 08:39:23','USER_LOGIN',1,'2013-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(535,'2013-03-23 13:04:55','USER_LOGIN',1,'2013-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(536,'2013-03-23 15:47:43','USER_LOGIN',1,'2013-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(537,'2013-03-23 22:56:36','USER_LOGIN',1,'2013-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(538,'2013-03-24 01:22:32','USER_LOGIN',1,'2013-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(539,'2013-03-24 14:40:42','USER_LOGIN',1,'2013-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(540,'2013-03-24 15:30:26','USER_LOGOUT',1,'2013-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(541,'2013-03-24 15:30:29','USER_LOGIN',1,'2013-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(542,'2013-03-24 15:49:40','USER_LOGOUT',1,'2013-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(543,'2013-03-24 15:49:48','USER_LOGIN',1,'2013-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(544,'2013-03-24 15:52:35','USER_MODIFY',1,'2013-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(545,'2013-03-24 15:52:52','USER_MODIFY',1,'2013-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(546,'2013-03-24 15:53:09','USER_MODIFY',1,'2013-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(547,'2013-03-24 15:53:23','USER_MODIFY',1,'2013-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(548,'2013-03-24 16:00:04','USER_MODIFY',1,'2013-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(549,'2013-03-24 16:01:50','USER_MODIFY',1,'2013-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(550,'2013-03-24 16:10:14','USER_MODIFY',1,'2013-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(551,'2013-03-24 16:55:13','USER_LOGIN',1,'2013-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(552,'2013-03-24 17:44:29','USER_LOGIN',1,'2013-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL),(553,'2013-09-08 23:06:26','USER_LOGIN',1,'2013-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL),(554,'2013-10-21 22:32:28','USER_LOGIN',1,'2013-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(555,'2013-10-21 22:32:48','USER_LOGIN',1,'2013-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL),(556,'2013-11-07 00:01:51','USER_LOGIN',1,'2013-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL),(557,'2014-03-02 15:21:07','USER_LOGIN',1,'2014-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(558,'2014-03-02 15:36:53','USER_LOGIN',1,'2014-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(559,'2014-03-02 18:54:23','USER_LOGIN',1,'2014-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(560,'2014-03-02 19:11:17','USER_LOGIN',1,'2014-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(561,'2014-03-03 18:19:24','USER_LOGIN',1,'2014-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL),(562,'2014-12-21 12:51:38','USER_LOGIN',1,'2014-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(563,'2014-12-21 19:52:09','USER_LOGIN',1,'2014-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL),(566,'2015-10-03 08:49:43','USER_NEW_PASSWORD',1,'2015-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(567,'2015-10-03 08:49:43','USER_MODIFY',1,'2015-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(568,'2015-10-03 09:03:12','USER_MODIFY',1,'2015-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(569,'2015-10-03 09:03:42','USER_MODIFY',1,'2015-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(570,'2015-10-03 09:07:36','USER_MODIFY',1,'2015-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(571,'2015-10-03 09:08:58','USER_NEW_PASSWORD',1,'2015-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(572,'2015-10-03 09:08:58','USER_MODIFY',1,'2015-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(573,'2015-10-03 09:09:23','USER_MODIFY',1,'2015-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(574,'2015-10-03 09:11:04','USER_NEW_PASSWORD',1,'2015-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(575,'2015-10-03 09:11:04','USER_MODIFY',1,'2015-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(576,'2015-10-03 09:11:53','USER_MODIFY',1,'2015-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(577,'2015-10-03 09:42:12','USER_LOGIN_FAILED',1,'2015-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(578,'2015-10-03 09:42:19','USER_LOGIN_FAILED',1,'2015-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(579,'2015-10-03 09:42:42','USER_LOGIN_FAILED',1,'2015-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(580,'2015-10-03 09:43:50','USER_LOGIN',1,'2015-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(581,'2015-10-03 09:44:44','GROUP_MODIFY',1,'2015-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(582,'2015-10-03 09:46:25','GROUP_CREATE',1,'2015-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(583,'2015-10-03 09:46:46','GROUP_CREATE',1,'2015-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(584,'2015-10-03 09:47:41','USER_CREATE',1,'2015-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(585,'2015-10-03 09:47:41','USER_NEW_PASSWORD',1,'2015-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(586,'2015-10-03 09:47:53','USER_MODIFY',1,'2015-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(587,'2015-10-03 09:48:32','USER_DELETE',1,'2015-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(588,'2015-10-03 09:48:52','USER_MODIFY',1,'2015-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(589,'2015-10-03 10:01:28','USER_MODIFY',1,'2015-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(590,'2015-10-03 10:01:39','USER_MODIFY',1,'2015-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(591,'2015-10-05 06:32:38','USER_LOGIN_FAILED',1,'2015-10-05 08:32:38',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(592,'2015-10-05 06:32:44','USER_LOGIN',1,'2015-10-05 08:32:44',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(593,'2015-10-05 07:07:52','USER_CREATE',1,'2015-10-05 09:07:52',1,'User atheceo created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(594,'2015-10-05 07:07:52','USER_NEW_PASSWORD',1,'2015-10-05 09:07:52',1,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(595,'2015-10-05 07:09:08','USER_NEW_PASSWORD',1,'2015-10-05 09:09:08',1,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(596,'2015-10-05 07:09:08','USER_MODIFY',1,'2015-10-05 09:09:08',1,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(597,'2015-10-05 07:09:46','USER_CREATE',1,'2015-10-05 09:09:46',1,'User admin created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(598,'2015-10-05 07:09:46','USER_NEW_PASSWORD',1,'2015-10-05 09:09:46',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(599,'2015-10-05 07:10:20','USER_MODIFY',1,'2015-10-05 09:10:20',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(600,'2015-10-05 07:10:48','USER_MODIFY',1,'2015-10-05 09:10:48',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(601,'2015-10-05 07:11:22','USER_NEW_PASSWORD',1,'2015-10-05 09:11:22',1,'Password change for bbookkeeper','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(602,'2015-10-05 07:11:22','USER_MODIFY',1,'2015-10-05 09:11:22',1,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(603,'2015-10-05 07:12:37','USER_MODIFY',1,'2015-10-05 09:12:37',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(604,'2015-10-05 07:13:27','USER_MODIFY',1,'2015-10-05 09:13:27',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(605,'2015-10-05 07:13:52','USER_MODIFY',1,'2015-10-05 09:13:52',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(606,'2015-10-05 07:14:35','USER_LOGOUT',1,'2015-10-05 09:14:35',1,'(UserLogoff,aeinstein)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(607,'2015-10-05 07:14:40','USER_LOGIN_FAILED',1,'2015-10-05 09:14:40',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(608,'2015-10-05 07:14:44','USER_LOGIN_FAILED',1,'2015-10-05 09:14:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(609,'2015-10-05 07:14:49','USER_LOGIN',1,'2015-10-05 09:14:49',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(610,'2015-10-05 07:57:18','USER_MODIFY',1,'2015-10-05 09:57:18',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(611,'2015-10-05 08:06:54','USER_LOGOUT',1,'2015-10-05 10:06:54',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(612,'2015-10-05 08:07:03','USER_LOGIN',1,'2015-10-05 10:07:03',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(613,'2015-10-05 19:18:46','USER_LOGIN',1,'2015-10-05 21:18:46',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(614,'2015-10-05 19:29:35','USER_CREATE',1,'2015-10-05 21:29:35',11,'User ccommercy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(615,'2015-10-05 19:29:35','USER_NEW_PASSWORD',1,'2015-10-05 21:29:35',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(616,'2015-10-05 19:30:13','GROUP_CREATE',1,'2015-10-05 21:30:13',11,'Group Commercial created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(617,'2015-10-05 19:31:37','USER_NEW_PASSWORD',1,'2015-10-05 21:31:37',11,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(618,'2015-10-05 19:31:37','USER_MODIFY',1,'2015-10-05 21:31:37',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(619,'2015-10-05 19:32:00','USER_MODIFY',1,'2015-10-05 21:32:00',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(620,'2015-10-05 19:33:33','USER_CREATE',1,'2015-10-05 21:33:33',11,'User sscientol created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(621,'2015-10-05 19:33:33','USER_NEW_PASSWORD',1,'2015-10-05 21:33:33',11,'Password change for sscientol','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(622,'2015-10-05 19:33:47','USER_NEW_PASSWORD',1,'2015-10-05 21:33:47',11,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(623,'2015-10-05 19:33:47','USER_MODIFY',1,'2015-10-05 21:33:47',11,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(624,'2015-10-05 19:34:23','USER_NEW_PASSWORD',1,'2015-10-05 21:34:23',11,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(625,'2015-10-05 19:34:23','USER_MODIFY',1,'2015-10-05 21:34:23',11,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(626,'2015-10-05 19:34:42','USER_MODIFY',1,'2015-10-05 21:34:42',11,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(627,'2015-10-05 19:36:06','USER_NEW_PASSWORD',1,'2015-10-05 21:36:06',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(628,'2015-10-05 19:36:06','USER_MODIFY',1,'2015-10-05 21:36:06',11,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(629,'2015-10-05 19:36:57','USER_NEW_PASSWORD',1,'2015-10-05 21:36:57',11,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(630,'2015-10-05 19:36:57','USER_MODIFY',1,'2015-10-05 21:36:57',11,'User atheceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(631,'2015-10-05 19:37:27','USER_LOGOUT',1,'2015-10-05 21:37:27',11,'(UserLogoff,atheceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(632,'2015-10-05 19:37:35','USER_LOGIN_FAILED',1,'2015-10-05 21:37:35',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(633,'2015-10-05 19:37:39','USER_LOGIN_FAILED',1,'2015-10-05 21:37:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(634,'2015-10-05 19:37:44','USER_LOGIN_FAILED',1,'2015-10-05 21:37:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(635,'2015-10-05 19:37:49','USER_LOGIN_FAILED',1,'2015-10-05 21:37:49',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(636,'2015-10-05 19:38:12','USER_LOGIN_FAILED',1,'2015-10-05 21:38:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(637,'2015-10-05 19:40:48','USER_LOGIN_FAILED',1,'2015-10-05 21:40:48',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(638,'2015-10-05 19:40:55','USER_LOGIN',1,'2015-10-05 21:40:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(639,'2015-10-05 19:43:34','USER_MODIFY',1,'2015-10-05 21:43:34',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(640,'2015-10-05 19:45:43','USER_CREATE',1,'2015-10-05 21:45:43',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(641,'2015-10-05 19:45:43','USER_NEW_PASSWORD',1,'2015-10-05 21:45:43',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(642,'2015-10-05 19:46:18','USER_DELETE',1,'2015-10-05 21:46:18',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(643,'2015-10-05 19:47:09','USER_MODIFY',1,'2015-10-05 21:47:09',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(644,'2015-10-05 19:47:22','USER_MODIFY',1,'2015-10-05 21:47:22',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(645,'2015-10-05 19:52:05','USER_MODIFY',1,'2015-10-05 21:52:05',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(646,'2015-10-05 19:52:23','USER_MODIFY',1,'2015-10-05 21:52:23',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(647,'2015-10-05 19:54:54','USER_NEW_PASSWORD',1,'2015-10-05 21:54:54',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(648,'2015-10-05 19:54:54','USER_MODIFY',1,'2015-10-05 21:54:54',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(649,'2015-10-05 19:57:02','USER_MODIFY',1,'2015-10-05 21:57:02',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(650,'2015-10-05 19:57:57','USER_NEW_PASSWORD',1,'2015-10-05 21:57:57',12,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(651,'2015-10-05 19:57:57','USER_MODIFY',1,'2015-10-05 21:57:57',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(652,'2015-10-05 19:59:42','USER_NEW_PASSWORD',1,'2015-10-05 21:59:42',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(653,'2015-10-05 19:59:42','USER_MODIFY',1,'2015-10-05 21:59:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(654,'2015-10-05 20:00:21','USER_MODIFY',1,'2015-10-05 22:00:21',12,'User adminx modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(655,'2015-10-05 20:05:36','USER_MODIFY',1,'2015-10-05 22:05:36',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(656,'2015-10-05 20:06:25','USER_MODIFY',1,'2015-10-05 22:06:25',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(657,'2015-10-05 20:07:18','USER_MODIFY',1,'2015-10-05 22:07:18',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(658,'2015-10-05 20:07:36','USER_MODIFY',1,'2015-10-05 22:07:36',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(659,'2015-10-05 20:08:34','USER_MODIFY',1,'2015-10-05 22:08:34',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(660,'2015-10-05 20:47:52','USER_CREATE',1,'2015-10-05 22:47:52',12,'User cc1 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(661,'2015-10-05 20:47:52','USER_NEW_PASSWORD',1,'2015-10-05 22:47:52',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(662,'2015-10-05 20:47:55','USER_LOGOUT',1,'2015-10-05 22:47:55',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(663,'2015-10-05 20:48:08','USER_LOGIN',1,'2015-10-05 22:48:08',11,'(UserLogged,zzeceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x434','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(664,'2015-10-05 20:48:39','USER_CREATE',1,'2015-10-05 22:48:39',11,'User cc2 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(665,'2015-10-05 20:48:39','USER_NEW_PASSWORD',1,'2015-10-05 22:48:39',11,'Password change for cc2','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(666,'2015-10-05 20:48:59','USER_NEW_PASSWORD',1,'2015-10-05 22:48:59',11,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(667,'2015-10-05 20:48:59','USER_MODIFY',1,'2015-10-05 22:48:59',11,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(668,'2015-10-05 21:06:36','USER_LOGOUT',1,'2015-10-05 23:06:35',11,'(UserLogoff,zzeceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(669,'2015-10-05 21:06:44','USER_LOGIN_FAILED',1,'2015-10-05 23:06:44',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(670,'2015-10-05 21:07:12','USER_LOGIN_FAILED',1,'2015-10-05 23:07:12',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(671,'2015-10-05 21:07:19','USER_LOGIN_FAILED',1,'2015-10-05 23:07:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(672,'2015-10-05 21:07:27','USER_LOGIN_FAILED',1,'2015-10-05 23:07:27',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(673,'2015-10-05 21:07:32','USER_LOGIN',1,'2015-10-05 23:07:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(674,'2015-10-05 21:12:28','USER_NEW_PASSWORD',1,'2015-10-05 23:12:28',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(675,'2015-10-05 21:12:28','USER_MODIFY',1,'2015-10-05 23:12:28',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(676,'2015-10-05 21:13:00','USER_CREATE',1,'2015-10-05 23:13:00',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(677,'2015-10-05 21:13:00','USER_NEW_PASSWORD',1,'2015-10-05 23:13:00',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(678,'2015-10-05 21:13:40','USER_DELETE',1,'2015-10-05 23:13:40',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(679,'2015-10-05 21:14:47','USER_LOGOUT',1,'2015-10-05 23:14:47',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(680,'2015-10-05 21:14:56','USER_LOGIN',1,'2015-10-05 23:14:56',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(681,'2015-10-05 21:15:56','USER_LOGOUT',1,'2015-10-05 23:15:56',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(682,'2015-10-05 21:16:06','USER_LOGIN',1,'2015-10-05 23:16:06',17,'(UserLogged,cc2) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(683,'2015-10-05 21:37:25','USER_LOGOUT',1,'2015-10-05 23:37:25',17,'(UserLogoff,cc2)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(684,'2015-10-05 21:37:31','USER_LOGIN',1,'2015-10-05 23:37:31',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(685,'2015-10-05 21:43:53','USER_LOGOUT',1,'2015-10-05 23:43:53',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(686,'2015-10-05 21:44:00','USER_LOGIN',1,'2015-10-05 23:44:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(687,'2015-10-05 21:46:17','USER_LOGOUT',1,'2015-10-05 23:46:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(688,'2015-10-05 21:46:24','USER_LOGIN',1,'2015-10-05 23:46:24',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL),(689,'2015-11-04 15:17:06','USER_LOGIN',1,'2015-11-04 16:17:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL);
 /*!40000 ALTER TABLE `llx_events` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5615,7 +5615,7 @@ CREATE TABLE `llx_menu` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_menu_uk_menu` (`menu_handler`,`fk_menu`,`position`,`url`,`entity`),
   KEY `idx_menu_menuhandler_type` (`menu_handler`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=113729 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=118954 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5624,7 +5624,7 @@ CREATE TABLE `llx_menu` (
 
 LOCK TABLES `llx_menu` WRITE;
 /*!40000 ALTER TABLE `llx_menu` DISABLE KEYS */;
-INSERT INTO `llx_menu` VALUES (19289,'all',1,'cashdesk','top','cashdesk',0,NULL,NULL,100,'/cashdesk/index.php?user=__LOGIN__','pointofsale','CashDeskMenu','cashdesk',NULL,NULL,'1','$conf->cashdesk->enabled',0,'2012-12-08 13:11:09'),(87422,'smartphone',1,NULL,'top','home',0,NULL,NULL,1,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2013-02-24 18:29:15'),(87423,'smartphone',1,NULL,'top','companies',0,NULL,NULL,2,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled || $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87424,'smartphone',1,NULL,'top','products',0,NULL,NULL,3,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2013-02-24 18:29:15'),(87426,'smartphone',1,NULL,'top','commercial',0,NULL,NULL,5,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87427,'smartphone',1,NULL,'top','accountancy',0,NULL,NULL,6,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled',2,'2013-02-24 18:29:15'),(87428,'smartphone',1,NULL,'top','project',0,NULL,NULL,7,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',0,'2013-02-24 18:29:15'),(87429,'smartphone',1,NULL,'top','tools',0,NULL,NULL,8,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled',2,'2013-02-24 18:29:15'),(87432,'smartphone',1,NULL,'top','shop',0,NULL,NULL,11,'/boutique/index.php?mainmenu=shop&amp;leftmenu=','','OSCommerce','shop',-1,'','','! empty($conf->boutique->enabled)',0,'2013-02-24 18:29:15'),(87434,'smartphone',1,NULL,'top','members',0,NULL,NULL,15,'/adherents/index.php?mainmenu=members&amp;leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(87435,'smartphone',1,NULL,'top','bank',0,NULL,NULL,6,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(87521,'smartphone',1,NULL,'left','home',87422,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87522,'smartphone',1,NULL,'left','home',87521,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87523,'smartphone',1,NULL,'left','home',87521,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87524,'smartphone',1,NULL,'left','home',87521,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87525,'smartphone',1,NULL,'left','home',87521,NULL,NULL,5,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87526,'smartphone',1,NULL,'left','home',87521,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87527,'smartphone',1,NULL,'left','home',87521,NULL,NULL,6,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87529,'smartphone',1,NULL,'left','home',87521,NULL,NULL,7,'/admin/perms.php?leftmenu=setup','','Security','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87530,'smartphone',1,NULL,'left','home',87521,NULL,NULL,9,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87531,'smartphone',1,NULL,'left','home',87521,NULL,NULL,8,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87532,'smartphone',1,NULL,'left','home',87521,NULL,NULL,10,'/admin/dict.php?leftmenu=setup','','DictionarySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87533,'smartphone',1,NULL,'left','home',87521,NULL,NULL,11,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87621,'smartphone',1,NULL,'left','home',87422,NULL,NULL,1,'/admin/system/index.php?leftmenu=system','','SystemInfo','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87622,'smartphone',1,NULL,'left','home',87621,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=system','','Dolibarr','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87623,'smartphone',1,NULL,'left','home',87622,NULL,NULL,1,'/admin/system/constall.php?leftmenu=system','','AllParameters','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87624,'smartphone',1,NULL,'left','home',87622,NULL,NULL,4,'/admin/system/about.php?leftmenu=system','','About','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87625,'smartphone',1,NULL,'left','home',87621,NULL,NULL,1,'/admin/system/os.php?leftmenu=system','','OS','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87626,'smartphone',1,NULL,'left','home',87621,NULL,NULL,2,'/admin/system/web.php?leftmenu=system','','WebServer','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87627,'smartphone',1,NULL,'left','home',87621,NULL,NULL,3,'/admin/system/phpinfo.php?leftmenu=system','','Php','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87628,'smartphone',1,NULL,'left','home',87622,NULL,NULL,3,'/admin/triggers.php?leftmenu=system','','Triggers','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87629,'smartphone',1,NULL,'left','home',87622,NULL,NULL,2,'/admin/system/modules.php?leftmenu=system','','Modules','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87631,'smartphone',1,NULL,'left','home',87621,NULL,NULL,4,'/admin/system/database.php?leftmenu=system','','Database','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87632,'smartphone',1,NULL,'left','home',87631,NULL,NULL,0,'/admin/system/database-tables.php?leftmenu=system','','Tables','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87721,'smartphone',1,NULL,'left','home',87422,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87722,'smartphone',1,NULL,'left','home',87721,NULL,NULL,0,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87723,'smartphone',1,NULL,'left','home',87721,NULL,NULL,1,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87724,'smartphone',1,NULL,'left','home',87721,NULL,NULL,6,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87725,'smartphone',1,NULL,'left','home',87721,NULL,NULL,3,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','1 && function_exists(\'eaccelerator_info\')',2,'2013-02-24 18:29:15'),(87726,'smartphone',1,NULL,'left','home',87721,NULL,NULL,2,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87727,'smartphone',1,NULL,'left','home',87721,NULL,NULL,4,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87728,'smartphone',1,NULL,'left','home',87721,NULL,NULL,7,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','1',2,'2013-02-24 18:29:15'),(87729,'smartphone',1,NULL,'left','home',87721,NULL,NULL,5,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87821,'smartphone',1,NULL,'left','home',87422,NULL,NULL,3,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'','','1',2,'2013-02-24 18:29:15'),(87822,'smartphone',1,NULL,'left','home',87821,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','1',2,'2013-02-24 18:29:15'),(87823,'smartphone',1,NULL,'left','home',87822,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','1',2,'2013-02-24 18:29:15'),(87824,'smartphone',1,NULL,'left','home',87821,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','1',2,'2013-02-24 18:29:15'),(87825,'smartphone',1,NULL,'left','home',87824,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','1',2,'2013-02-24 18:29:15'),(87921,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,0,'/societe/societe.php','','ThirdParty','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87922,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87924,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,5,'/fourn/list.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87925,'smartphone',1,NULL,'left','companies',87924,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87927,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87928,'smartphone',1,NULL,'left','companies',87927,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87930,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87931,'smartphone',1,NULL,'left','companies',87930,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88021,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses||Contacts@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88022,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88023,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88025,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','Prospects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88026,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','Customers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88027,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','Suppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(88028,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88071,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88072,'smartphone',1,NULL,'left','companies',88071,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88081,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88082,'smartphone',1,NULL,'left','companies',88081,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88121,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,1,'/comm/prospect/index.php?leftmenu=prospects','','Prospects','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88122,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88123,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,1,'/comm/prospect/list.php?leftmenu=prospects','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88124,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,0,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=-1','','LastProspectDoNotContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88125,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,1,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=0','','LastProspectNeverContacted','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88126,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,2,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=1','','LastProspectToContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88127,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,3,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=2','','LastProspectContactInProcess','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88128,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,4,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=3','','LastProspectContactDone','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88129,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,2,'/contact/list.php?leftmenu=prospects&amp;type=p','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88221,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,2,'/comm/index.php?leftmenu=customers','','Customers','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88222,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88223,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,1,'/comm/list.php?leftmenu=customers','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88224,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,2,'/contact/list.php?leftmenu=customers&amp;type=c','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88321,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,3,'/contact/list.php?leftmenu=contacts','','Contacts','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88322,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88323,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88331,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','Prospects','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88332,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=c','','Customers','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88333,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=f','','Suppliers','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88334,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=o','','Other','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,4,'/comm/propal.php?leftmenu=propals','','Prop','propal',0,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(88522,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,0,'/societe/societe.php?leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88523,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,1,'/comm/propal.php?viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88524,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,2,'/comm/propal.php?viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88525,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,3,'/comm/propal.php?viewstatut=2,3,4','','PropalStatusClosedShort','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88526,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88621,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(88622,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,0,'/societe/societe.php?leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88623,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88624,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88625,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88626,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88627,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88628,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88629,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88630,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88721,'smartphone',1,NULL,'left','commercial',87424,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','orders',0,'','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2013-02-24 18:29:15'),(88722,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,0,'/expedition/list.php?leftmenu=sendings','','List','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88723,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,1,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88821,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88822,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,0,'/societe/societe.php?leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88823,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88824,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88825,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88826,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88827,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88828,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88921,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-02-24 18:29:15'),(88922,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(88923,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(89021,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/fourn/facture/index.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89022,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89023,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89024,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89122,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,3,'/compta/clients.php?action=facturer&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89123,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,4,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','Repeatable','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89124,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,5,'/compta/facture/impayees.php?action=facturer&amp;leftmenu=customers_bills','','Unpaid','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89125,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89131,'smartphone',1,NULL,'left','accountancy',89125,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89132,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89133,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89134,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89135,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89321,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',0,'2013-02-24 18:29:15'),(89421,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,4,'/compta/dons/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'','$user->rights->don->lire','$conf->don->enabled',2,'2013-02-24 18:29:15'),(89422,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,0,'/compta/dons/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89423,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,1,'/compta/dons/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89521,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2013-02-24 18:29:15'),(89522,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89523,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89524,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89621,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuTaxAndDividends','compta',0,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89622,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89623,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89624,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89721,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2013-02-24 18:29:15'),(89722,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89723,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89724,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89725,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89821,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,8,'/compta/ventilation/index.php?leftmenu=ventil','','Ventilation','companies',0,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89822,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,0,'/compta/ventilation/list.php','','ToDispatch','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89823,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,1,'/compta/ventilation/lignes.php','','Dispatched','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89824,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,2,'/compta/param/','','Setup','companies',1,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89825,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,0,'/compta/param/comptes/list.php','','List','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89826,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,1,'/compta/param/comptes/card.php?action=create','','New','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89827,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,3,'/compta/export/','','Export','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89828,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,0,'/compta/export/index.php','','New','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89829,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,1,'/compta/export/list.php','','List','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89921,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(89922,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,1,'/compta/prelevement/demandes.php?status=0&amp;leftmenu=withdraw','','StandingOrderToProcess','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89923,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89924,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89925,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89927,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89928,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(90021,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'','$user->rights->banque->lire','$conf->banque->enabled',0,'2013-02-24 18:29:15'),(90022,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90023,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90024,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90025,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90027,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90122,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90123,'smartphone',1,NULL,'left','accountancy',90122,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90124,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90125,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90126,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90221,'smartphone',1,NULL,'left','products',87424,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90222,'smartphone',1,NULL,'left','products',90221,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90223,'smartphone',1,NULL,'left','products',90221,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90224,'smartphone',1,NULL,'left','products',90221,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90321,'smartphone',1,NULL,'left','products',87424,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90322,'smartphone',1,NULL,'left','products',90321,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90323,'smartphone',1,NULL,'left','products',90321,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90421,'smartphone',1,NULL,'left','products',87424,NULL,NULL,2,'/product/stats/index.php?leftmenu=stats','','Statistics','main',0,'','$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',2,'2013-02-24 18:29:15'),(90422,'smartphone',1,NULL,'left','products',90421,NULL,NULL,0,'/product/popuprop.php?leftmenu=stats','','Popularity','main',1,'','$user->rights->produit->lire && $user->rights->produit>lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(90521,'smartphone',1,NULL,'left','products',87424,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90522,'smartphone',1,NULL,'left','products',90521,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90523,'smartphone',1,NULL,'left','products',90521,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90524,'smartphone',1,NULL,'left','products',90521,NULL,NULL,2,'/product/stock/valo.php','','EnhancedValue','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90525,'smartphone',1,NULL,'left','products',90521,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90621,'smartphone',1,NULL,'left','products',87424,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(90622,'smartphone',1,NULL,'left','products',90621,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(91021,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91022,'smartphone',1,NULL,'left','project',91021,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91023,'smartphone',1,NULL,'left','project',91021,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91031,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91032,'smartphone',1,NULL,'left','project',91031,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91033,'smartphone',1,NULL,'left','project',91031,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91121,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91122,'smartphone',1,NULL,'left','project',91121,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91123,'smartphone',1,NULL,'left','project',91121,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91124,'smartphone',1,NULL,'left','project',91121,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91221,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91222,'smartphone',1,NULL,'left','project',91221,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91223,'smartphone',1,NULL,'left','project',91221,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91224,'smartphone',1,NULL,'left','project',91221,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91321,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91322,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91323,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91521,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'','$user->rights->export->lire','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91522,'smartphone',1,NULL,'left','tools',91521,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91551,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91552,'smartphone',1,NULL,'left','tools',91551,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91622,'smartphone',1,NULL,'left','members',91621,NULL,NULL,0,'/adherents/card.php?action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91623,'smartphone',1,NULL,'left','members',91621,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91624,'smartphone',1,NULL,'left','members',91623,NULL,NULL,2,'/adherents/list.php?statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91625,'smartphone',1,NULL,'left','members',91623,NULL,NULL,3,'/adherents/list.php?statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91626,'smartphone',1,NULL,'left','members',91623,NULL,NULL,4,'/adherents/list.php?statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91627,'smartphone',1,NULL,'left','members',91623,NULL,NULL,5,'/adherents/list.php?statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91628,'smartphone',1,NULL,'left','members',91623,NULL,NULL,6,'/adherents/list.php?statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91721,'smartphone',1,NULL,'left','members',87434,NULL,NULL,1,'/adherents/index.php?leftmenu=accountancy&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91722,'smartphone',1,NULL,'left','members',91721,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91723,'smartphone',1,NULL,'left','members',91721,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=accountancy','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91921,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91922,'smartphone',1,NULL,'left','members',91921,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2013-02-24 18:29:15'),(91923,'smartphone',1,NULL,'left','members',91921,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91924,'smartphone',1,NULL,'left','members',91921,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92121,'smartphone',1,NULL,'left','members',87434,NULL,NULL,5,'/adherents/index.php?leftmenu=setup&amp;mainmenu=members','','Setup','members',0,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92122,'smartphone',1,NULL,'left','members',92121,NULL,NULL,0,'/adherents/type.php?leftmenu=setup','','MembersTypes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92123,'smartphone',1,NULL,'left','members',92121,NULL,NULL,1,'/adherents/options.php?leftmenu=setup','','MembersAttributes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92421,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,0,'/compta/index.php?leftmenu=suppliers','','Suppliers','companies',0,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92422,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,0,'/societe/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f','','NewSupplier','companies',1,'','$user->rights->societe->creer && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92423,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,1,'/fourn/list.php?leftmenu=suppliers','','List','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92424,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,2,'/contact/list.php?leftmenu=suppliers&amp;type=f','','Contacts','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(92522,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,0,'/societe/societe.php?leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92523,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92529,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(92622,'smartphone',1,NULL,'left','members',92621,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103108,'all',2,'pos','top','pos',0,NULL,NULL,100,'/pos/backend/listefac.php','','POS','pos@pos',NULL,'1','1','1',2,'2013-03-13 20:33:09'),(103109,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/list.php','','Tickets','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103110,'all',2,'pos','left','pos',103109,NULL,NULL,100,'/pos/backend/list.php','','List','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103111,'all',2,'pos','left','pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=0','','StatusTicketDraft','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103112,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=1','','StatusTicketClosed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103113,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=2','','StatusTicketProcessed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103114,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewtype=1','','StatusTicketReturned','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103115,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/listefac.php','','Factures','pos@pos',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103116,'all',2,'pos','left','pos',103115,NULL,NULL,100,'/pos/backend/listefac.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103117,'all',2,'pos','left','pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=0','','BillStatusDraft','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103118,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=1','','BillStatusValidated','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103119,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=2&viewtype=0','','BillStatusPaid','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103120,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewtype=2','','BillStatusReturned','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103121,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/frontend/index.php','','POS','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103122,'all',2,'pos','left','@pos',103121,NULL,NULL,100,'/pos/frontend/index.php','','NewTicket','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103123,'all',2,'pos','left','@pos',103121,NULL,NULL,101,'/pos/backend/closes.php','','CloseandArching','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103124,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/backend/terminal/cash.php','','Terminal','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103125,'all',2,'pos','left','@pos',103124,NULL,NULL,100,'/pos/backend/terminal/card.php?action=create','','NewCash','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103126,'all',2,'pos','left','@pos',103124,NULL,NULL,101,'/pos/backend/terminal/cash.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103127,'all',2,'pos','left','@pos',103123,NULL,NULL,101,'/pos/backend/closes.php?viewstatut=0','','Arqueo','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103128,'all',2,'pos','left','@pos',103123,NULL,NULL,102,'/pos/backend/closes.php?viewstatut=1','','Closes','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103129,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/transfers.php','','Transfer','main',NULL,NULL,'$user->rights->pos->transfer','1',0,'2013-03-13 20:33:09'),(103130,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/resultat/index.php','','Rapport','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103131,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/casoc.php','','ReportsCustomer','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103132,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/causer.php','','ReportsUser','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103133,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/sellsjournal.php','','ReportsSells','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(108504,'all',1,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108505,'all',1,'agenda','left','agenda',108504,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108506,'all',1,'agenda','left','agenda',108505,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108507,'all',1,'agenda','left','agenda',108505,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108508,'all',1,'agenda','left','agenda',108507,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108509,'all',1,'agenda','left','agenda',108507,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108510,'all',1,'agenda','left','agenda',108507,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-03 08:46:14'),(108511,'all',1,'agenda','left','agenda',108507,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-03 08:46:14'),(108512,'all',1,'agenda','left','agenda',108505,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108513,'all',1,'agenda','left','agenda',108512,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108514,'all',1,'agenda','left','agenda',108512,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108515,'all',1,'agenda','left','agenda',108512,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-03 08:46:14'),(108516,'all',1,'agenda','left','agenda',108512,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-03 08:46:14'),(108517,'all',1,'agenda','left','agenda',108505,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-10-03 08:46:14'),(108518,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2015-10-03 08:46:14'),(108519,'all',1,'barcode','left','home',-1,'modulesadmintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && $leftmenu==\"modulesadmintools\"',0,'2015-10-03 08:46:14'),(108520,'all',1,'cron','left','home',-1,'modulesadmintools','home',200,'/cron/list.php?status=-1','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2015-10-03 08:46:15'),(108521,'all',1,'ecm','top','ecm',0,NULL,NULL,100,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2015-10-03 08:46:15'),(108522,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-03 08:46:15'),(108523,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-03 08:46:15'),(108524,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-03 08:46:15'),(108525,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-10-03 08:46:16'),(108526,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2015-10-03 08:46:16'),(108527,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-10-03 08:46:16'),(108528,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2015-10-03 08:46:16'),(108529,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2015-10-03 08:46:16'),(108530,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2015-10-03 08:46:16'),(108532,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->fournisseur->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2015-10-03 08:46:16'),(108533,'auguria',1,'comptabilite|accounting|facture|deplacement|don|tax|salaries|loa','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $u','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled',2,'2015-10-03 08:46:16'),(108534,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(108535,'auguria',1,'mailing|export|import|opensurvey','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled',2,'2015-10-03 08:46:16'),(108540,'auguria',1,'adherent','top','members',0,NULL,NULL,110,'/adherents/index.php?mainmenu=members&amp;leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(108541,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2015-10-03 08:46:16'),(108542,'auguria',1,'hrm','top','hrm',0,NULL,NULL,80,'/compta/hrm.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2015-10-03 08:46:16'),(108627,'auguria',1,'','left','home',108528,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2015-10-03 08:46:16'),(108628,'auguria',1,'','left','home',108627,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108629,'auguria',1,'','left','home',108627,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108630,'auguria',1,'','left','home',108627,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108631,'auguria',1,'','left','home',108627,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108632,'auguria',1,'','left','home',108627,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108633,'auguria',1,'','left','home',108627,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108634,'auguria',1,'','left','home',108627,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108635,'auguria',1,'','left','home',108627,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108636,'auguria',1,'','left','home',108627,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108637,'auguria',1,'','left','home',108627,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108638,'auguria',1,'','left','home',108627,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108639,'auguria',1,'','left','home',108627,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108640,'auguria',1,'','left','home',108627,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108641,'auguria',1,'','left','home',108627,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-03 08:46:16'),(108728,'auguria',1,'','left','home',108827,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108729,'auguria',1,'','left','home',108728,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108730,'auguria',1,'','left','home',108728,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108732,'auguria',1,'','left','home',108827,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108733,'auguria',1,'','left','home',108827,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108734,'auguria',1,'','left','home',108827,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108735,'auguria',1,'','left','home',108827,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108737,'auguria',1,'','left','home',108827,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108827,'auguria',1,'','left','home',108528,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'admintools','','$user->admin',2,'2015-10-03 08:46:16'),(108828,'auguria',1,'','left','home',108827,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108829,'auguria',1,'','left','home',108827,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108832,'auguria',1,'','left','home',108827,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108833,'auguria',1,'','left','home',108827,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2015-10-03 08:46:16'),(108834,'auguria',1,'','left','home',108827,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108835,'auguria',1,'','left','home',108827,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108836,'auguria',1,'','left','home',108827,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108837,'auguria',1,'','left','home',108827,NULL,NULL,13,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108838,'auguria',1,'','left','home',108827,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-03 08:46:16'),(108927,'auguria',1,'','left','home',108528,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2015-10-03 08:46:16'),(108928,'auguria',1,'','left','home',108927,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2015-10-03 08:46:16'),(108929,'auguria',1,'','left','home',108928,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\"users\"',2,'2015-10-03 08:46:16'),(108930,'auguria',1,'','left','home',108927,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','$leftmenu==\"users\"',2,'2015-10-03 08:46:16'),(108931,'auguria',1,'','left','home',108930,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','$leftmenu==\"users\"',2,'2015-10-03 08:46:16'),(109027,'auguria',1,'','left','companies',108529,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109028,'auguria',1,'','left','companies',109027,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109030,'auguria',1,'','left','companies',109027,NULL,NULL,5,'/fourn/list.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(109031,'auguria',1,'','left','companies',109030,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(109033,'auguria',1,'','left','companies',109027,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109034,'auguria',1,'','left','companies',109033,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109036,'auguria',1,'','left','companies',109027,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109037,'auguria',1,'','left','companies',109036,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109127,'auguria',1,'','left','companies',108529,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109128,'auguria',1,'','left','companies',109127,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109129,'auguria',1,'','left','companies',109127,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109131,'auguria',1,'','left','companies',109129,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109132,'auguria',1,'','left','companies',109129,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109133,'auguria',1,'','left','companies',109129,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(109134,'auguria',1,'','left','companies',109129,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-03 08:46:16'),(109177,'auguria',1,'','left','companies',108529,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109178,'auguria',1,'','left','companies',109177,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109187,'auguria',1,'','left','companies',108529,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109188,'auguria',1,'','left','companies',109187,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109197,'auguria',1,'','left','companies',108529,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109198,'auguria',1,'','left','companies',109197,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:16'),(109627,'auguria',1,'','left','commercial',108532,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(109628,'auguria',1,'','left','commercial',109627,NULL,NULL,0,'/comm/propal.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(109629,'auguria',1,'','left','commercial',109627,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(109630,'auguria',1,'','left','commercial',109629,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-03 08:46:16'),(109631,'auguria',1,'','left','commercial',109629,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-03 08:46:16'),(109632,'auguria',1,'','left','commercial',109629,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-03 08:46:16'),(109633,'auguria',1,'','left','commercial',109629,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-03 08:46:16'),(109634,'auguria',1,'','left','commercial',109629,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-03 08:46:16'),(109637,'auguria',1,'','left','commercial',109627,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(109727,'auguria',1,'','left','commercial',108532,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-03 08:46:16'),(109728,'auguria',1,'','left','commercial',109727,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2015-10-03 08:46:16'),(109729,'auguria',1,'','left','commercial',109727,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-03 08:46:16'),(109730,'auguria',1,'','left','commercial',109729,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109731,'auguria',1,'','left','commercial',109729,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109732,'auguria',1,'','left','commercial',109729,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109733,'auguria',1,'','left','commercial',109729,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109734,'auguria',1,'','left','commercial',109729,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109735,'auguria',1,'','left','commercial',109729,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-03 08:46:16'),(109736,'auguria',1,'','left','commercial',109727,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-03 08:46:16'),(109827,'auguria',1,'','left','commercial',108530,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2015-10-03 08:46:16'),(109828,'auguria',1,'','left','commercial',109827,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-03 08:46:16'),(109829,'auguria',1,'','left','commercial',109827,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-03 08:46:16'),(109830,'auguria',1,'','left','commercial',109827,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-03 08:46:16'),(109927,'auguria',1,'','left','commercial',108532,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-03 08:46:16'),(109928,'auguria',1,'','left','commercial',109927,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2015-10-03 08:46:16'),(109929,'auguria',1,'','left','commercial',109927,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-03 08:46:16'),(109930,'auguria',1,'','left','commercial',109927,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-03 08:46:16'),(109931,'auguria',1,'','left','commercial',109930,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-03 08:46:16'),(109932,'auguria',1,'','left','commercial',109930,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-03 08:46:16'),(109933,'auguria',1,'','left','commercial',109930,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-03 08:46:16'),(109934,'auguria',1,'','left','commercial',109930,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-03 08:46:16'),(110027,'auguria',1,'','left','commercial',108532,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2015-10-03 08:46:16'),(110028,'auguria',1,'','left','commercial',110027,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2015-10-03 08:46:16'),(110029,'auguria',1,'','left','commercial',110027,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2015-10-03 08:46:16'),(110127,'auguria',1,'','left','accountancy',108533,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(110128,'auguria',1,'','left','accountancy',110127,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(110129,'auguria',1,'','left','accountancy',110127,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(110130,'auguria',1,'','left','accountancy',110127,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(110131,'auguria',1,'','left','accountancy',110127,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(110227,'auguria',1,'','left','accountancy',108533,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110228,'auguria',1,'','left','accountancy',110227,NULL,NULL,3,'/compta/facture.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110229,'auguria',1,'','left','accountancy',110227,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110230,'auguria',1,'','left','accountancy',110227,NULL,NULL,7,'/compta/facture/mergepdftool.php?action=facturer&amp;leftmenu=customers_bills','','MergingPDFTool','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110231,'auguria',1,'','left','accountancy',110227,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110232,'auguria',1,'','left','accountancy',110227,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110237,'auguria',1,'','left','accountancy',110231,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110238,'auguria',1,'','left','accountancy',108541,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-03 08:46:16'),(110239,'auguria',1,'','left','accountancy',110238,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-03 08:46:16'),(110240,'auguria',1,'','left','accountancy',110238,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-03 08:46:16'),(110241,'auguria',1,'','left','accountancy',110227,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110247,'auguria',1,'','left','accountancy',110232,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110248,'auguria',1,'','left','accountancy',110232,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110249,'auguria',1,'','left','accountancy',110232,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110250,'auguria',1,'','left','accountancy',110232,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-03 08:46:16'),(110427,'auguria',1,'','left','accountancy',108533,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2015-10-03 08:46:16'),(110527,'auguria',1,'','left','accountancy',108533,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2015-10-03 08:46:16'),(110528,'auguria',1,'','left','accountancy',110527,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2015-10-03 08:46:16'),(110529,'auguria',1,'','left','accountancy',110527,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2015-10-03 08:46:16'),(110627,'auguria',1,'','left','accountancy',108542,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-03 08:46:17'),(110628,'auguria',1,'','left','accountancy',110627,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2015-10-03 08:46:17'),(110629,'auguria',1,'','left','accountancy',110627,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-03 08:46:17'),(110630,'auguria',1,'','left','accountancy',110627,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-03 08:46:17'),(110727,'auguria',1,'','left','accountancy',108533,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2015-10-03 08:46:16'),(110737,'auguria',1,'','left','accountancy',110727,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->read','$conf->salaries->enabled',0,'2015-10-03 08:46:16'),(110738,'auguria',1,'','left','accountancy',110737,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2015-10-03 08:46:16'),(110739,'auguria',1,'','left','accountancy',110737,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2015-10-03 08:46:16'),(110747,'auguria',1,'','left','accountancy',110727,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2015-10-03 08:46:16'),(110748,'auguria',1,'','left','accountancy',110747,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-03 08:46:16'),(110749,'auguria',1,'','left','accountancy',110747,NULL,NULL,3,'/loan/index.php?leftmenu=tax_loan','','Payments','companies',2,'','$user->rights->loan->read','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-03 08:46:16'),(110750,'auguria',1,'','left','accountancy',110747,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-03 08:46:16'),(110777,'auguria',1,'','left','accountancy',110727,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2015-10-03 08:46:16'),(110778,'auguria',1,'','left','accountancy',110777,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2015-10-03 08:46:16'),(110779,'auguria',1,'','left','accountancy',110777,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2015-10-03 08:46:16'),(110827,'auguria',1,'','left','accountancy',110727,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2015-10-03 08:46:16'),(110828,'auguria',1,'','left','accountancy',110827,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-03 08:46:16'),(110829,'auguria',1,'','left','accountancy',110827,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-03 08:46:16'),(110830,'auguria',1,'','left','accountancy',110827,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-03 08:46:16'),(110831,'auguria',1,'','left','accountancy',110827,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-03 08:46:16'),(110927,'auguria',1,'','left','accountancy',108533,NULL,NULL,8,'/accountancy/customer/index.php?leftmenu=ventil_customer','','CustomersVentilation','accountancy',0,'ventil_customer','$user->rights->accounting->ventilation->read','$conf->accounting->enabled',0,'2015-10-03 08:46:16'),(110928,'auguria',1,'','left','accountancy',110927,NULL,NULL,0,'/accountancy/customer/list.php','','ToDispatch','accountancy',1,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $leftmenu==\"ventil_customer\"',0,'2015-10-03 08:46:16'),(110929,'auguria',1,'','left','accountancy',110927,NULL,NULL,1,'/accountancy/customer/lines.php','','Dispatched','accountancy',1,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $leftmenu==\"ventil_customer\"',0,'2015-10-03 08:46:16'),(110937,'auguria',1,'','left','accountancy',108533,NULL,NULL,9,'/accountancy/supplier/index.php?leftmenu=ventil_supplier','','SuppliersVentilation','accountancy',0,'ventil_supplier','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2015-10-03 08:46:16'),(110938,'auguria',1,'','left','accountancy',110937,NULL,NULL,0,'/accountancy/supplier/list.php','','ToDispatch','accountancy',1,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"ventil_supplier\"',0,'2015-10-03 08:46:16'),(110939,'auguria',1,'','left','accountancy',110937,NULL,NULL,1,'/accountancy/supplier/lines.php','','Dispatched','accountancy',1,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"ventil_supplier\"',0,'2015-10-03 08:46:16'),(111027,'auguria',1,'','left','accountancy',108541,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2015-10-03 08:46:16'),(111029,'auguria',1,'','left','accountancy',111027,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-03 08:46:16'),(111030,'auguria',1,'','left','accountancy',111027,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-03 08:46:16'),(111031,'auguria',1,'','left','accountancy',111027,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-03 08:46:16'),(111033,'auguria',1,'','left','accountancy',111027,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-03 08:46:16'),(111034,'auguria',1,'','left','accountancy',111027,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-03 08:46:16'),(111127,'auguria',1,'','left','accountancy',108541,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2015-10-03 08:46:16'),(111128,'auguria',1,'','left','accountancy',111127,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-03 08:46:16'),(111129,'auguria',1,'','left','accountancy',111127,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-03 08:46:16'),(111130,'auguria',1,'','left','accountancy',111127,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-03 08:46:16'),(111131,'auguria',1,'','left','accountancy',111127,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-03 08:46:16'),(111133,'auguria',1,'','left','accountancy',111127,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-03 08:46:16'),(111227,'auguria',1,'','left','accountancy',108533,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2015-10-03 08:46:16'),(111228,'auguria',1,'','left','accountancy',111227,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111229,'auguria',1,'','left','accountancy',111228,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111230,'auguria',1,'','left','accountancy',111227,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111231,'auguria',1,'','left','accountancy',111230,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111232,'auguria',1,'','left','accountancy',111230,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111233,'auguria',1,'','left','accountancy',111227,NULL,NULL,1,'/compta/journal/sellsjournal.php?leftmenu=ca','','SellsJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111234,'auguria',1,'','left','accountancy',111227,NULL,NULL,1,'/compta/journal/purchasesjournal.php?leftmenu=ca','','PurchasesJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111235,'auguria',1,'','left','accountancy',111230,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-03 08:46:16'),(111247,'auguria',1,'','left','accountancy',108533,NULL,NULL,12,'/accountancy/bookkeeping/list.php?leftmenu=bookkeeping','','Bookkeeping','accountancy',0,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2015-10-03 08:46:16'),(111248,'auguria',1,'','left','accountancy',111247,NULL,NULL,0,'/accountancy/bookkeeping/listbyyear.php','','ByYear','accountancy',1,'','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled && $leftmenu==\"bookkeeping\"',0,'2015-10-03 08:46:16'),(111249,'auguria',1,'','left','accountancy',111247,NULL,NULL,1,'/accountancy/bookkeeping/balancebymonth.php','','AccountBalanceByMonth','accountancy',1,'','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled && $leftmenu==\"bookkeeping\"',0,'2015-10-03 08:46:16'),(111277,'auguria',1,'','left','home',108533,NULL,NULL,20,'/accountancy/admin/fiscalyear.php?leftmenu=setup','','Fiscalyear','accountancy',1,'','$user->rights->accounting->fiscalyear','$conf->accounting->enabled',2,'2015-10-03 08:46:16'),(111278,'auguria',1,'','left','home',108533,NULL,NULL,21,'/accountancy/admin/account.php?mainmenu=accountancy','','Chartofaccounts','accountancy',1,'','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',2,'2015-10-03 08:46:16'),(111327,'auguria',1,'','left','products',108530,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2015-10-03 08:46:16'),(111328,'auguria',1,'','left','products',111327,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2015-10-03 08:46:16'),(111329,'auguria',1,'','left','products',111327,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2015-10-03 08:46:16'),(111330,'auguria',1,'','left','products',111327,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2015-10-03 08:46:16'),(111331,'auguria',1,'','left','products',111327,NULL,NULL,6,'/product/popuprop.php?leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(111332,'auguria',1,'','left','products',111327,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2015-10-03 08:46:16'),(111427,'auguria',1,'','left','products',108530,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2015-10-03 08:46:16'),(111428,'auguria',1,'','left','products',111427,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2015-10-03 08:46:16'),(111429,'auguria',1,'','left','products',111427,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2015-10-03 08:46:16'),(111430,'auguria',1,'','left','products',111427,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2015-10-03 08:46:16'),(111627,'auguria',1,'','left','products',108530,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2015-10-03 08:46:16'),(111628,'auguria',1,'','left','products',111627,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2015-10-03 08:46:16'),(111629,'auguria',1,'','left','products',111627,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2015-10-03 08:46:16'),(111631,'auguria',1,'','left','products',111627,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2015-10-03 08:46:16'),(111632,'auguria',1,'','left','products',111627,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(111633,'auguria',1,'','left','products',111627,NULL,NULL,5,'/product/stock/massstockmove.php','','StockTransfer','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2015-10-03 08:46:16'),(111727,'auguria',1,'','left','products',108530,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2015-10-03 08:46:16'),(111728,'auguria',1,'','left','products',111727,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2015-10-03 08:46:16'),(112127,'auguria',1,'','left','project',108534,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112128,'auguria',1,'','left','project',112127,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112129,'auguria',1,'','left','project',112127,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112137,'auguria',1,'','left','project',108534,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'myprojects','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112138,'auguria',1,'','left','project',112137,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112139,'auguria',1,'','left','project',112137,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112227,'auguria',1,'','left','project',108534,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112228,'auguria',1,'','left','project',112227,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112229,'auguria',1,'','left','project',112227,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112230,'auguria',1,'','left','project',112227,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112327,'auguria',1,'','left','project',108534,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112328,'auguria',1,'','left','project',112327,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112329,'auguria',1,'','left','project',112327,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112330,'auguria',1,'','left','project',112327,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-03 08:46:16'),(112427,'auguria',1,'','left','tools',108535,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2015-10-03 08:46:16'),(112428,'auguria',1,'','left','tools',112427,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2015-10-03 08:46:16'),(112429,'auguria',1,'','left','tools',112427,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2015-10-03 08:46:16'),(112627,'auguria',1,'','left','tools',108535,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2015-10-03 08:46:16'),(112628,'auguria',1,'','left','tools',112627,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2015-10-03 08:46:16'),(112657,'auguria',1,'','left','tools',108535,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2015-10-03 08:46:16'),(112658,'auguria',1,'','left','tools',112657,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2015-10-03 08:46:16'),(112727,'auguria',1,'','left','members',108540,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112728,'auguria',1,'','left','members',112727,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112729,'auguria',1,'','left','members',112727,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112730,'auguria',1,'','left','members',112729,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112731,'auguria',1,'','left','members',112729,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112732,'auguria',1,'','left','members',112729,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112733,'auguria',1,'','left','members',112729,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112734,'auguria',1,'','left','members',112729,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:16'),(112735,'auguria',1,'','left','members',112727,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(112827,'auguria',1,'','left','members',108540,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(112828,'auguria',1,'','left','members',112827,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(112829,'auguria',1,'','left','members',112827,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(112830,'auguria',1,'','left','members',112827,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113027,'auguria',1,'','left','members',108540,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113028,'auguria',1,'','left','members',113027,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2015-10-03 08:46:17'),(113029,'auguria',1,'','left','members',113027,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113030,'auguria',1,'','left','members',113027,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113227,'auguria',1,'','left','members',108540,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113228,'auguria',1,'','left','members',113227,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113229,'auguria',1,'','left','members',113227,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-03 08:46:17'),(113527,'auguria',1,'','left','hrm',108542,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->write','$conf->holiday->enabled',0,'2015-10-03 08:46:17'),(113528,'auguria',1,'','left','hrm',113527,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2015-10-03 08:46:17'),(113529,'auguria',1,'','left','hrm',113527,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2015-10-03 08:46:17'),(113530,'auguria',1,'','left','hrm',113527,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->view_log','$conf->holiday->enabled',0,'2015-10-03 08:46:17'),(113531,'auguria',1,'','left','hrm',113527,NULL,NULL,4,'/holiday/month_report.php?&action=request','','MenuReportMonth','holiday',1,'','$user->rights->holiday->month_report','$conf->holiday->enabled',0,'2015-10-03 08:46:17'),(113627,'auguria',1,'','left','commercial',108532,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(113628,'auguria',1,'','left','commercial',113627,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(113629,'auguria',1,'','left','commercial',113627,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(113635,'auguria',1,'','left','commercial',113627,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-03 08:46:16'),(113727,'auguria',1,'','left','members',108540,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:17'),(113728,'auguria',1,'','left','members',113727,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2015-10-03 08:46:17');
+INSERT INTO `llx_menu` VALUES (19289,'all',1,'cashdesk','top','cashdesk',0,NULL,NULL,100,'/cashdesk/index.php?user=__LOGIN__','pointofsale','CashDeskMenu','cashdesk',NULL,NULL,'1','$conf->cashdesk->enabled',0,'2012-12-08 13:11:09'),(87422,'smartphone',1,NULL,'top','home',0,NULL,NULL,1,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2013-02-24 18:29:15'),(87423,'smartphone',1,NULL,'top','companies',0,NULL,NULL,2,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled || $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87424,'smartphone',1,NULL,'top','products',0,NULL,NULL,3,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2013-02-24 18:29:15'),(87426,'smartphone',1,NULL,'top','commercial',0,NULL,NULL,5,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87427,'smartphone',1,NULL,'top','accountancy',0,NULL,NULL,6,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->commande->lire || $user->rights->facture->lire','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled',2,'2013-02-24 18:29:15'),(87428,'smartphone',1,NULL,'top','project',0,NULL,NULL,7,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',0,'2013-02-24 18:29:15'),(87429,'smartphone',1,NULL,'top','tools',0,NULL,NULL,8,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled',2,'2013-02-24 18:29:15'),(87432,'smartphone',1,NULL,'top','shop',0,NULL,NULL,11,'/boutique/index.php?mainmenu=shop&amp;leftmenu=','','OSCommerce','shop',-1,'','','! empty($conf->boutique->enabled)',0,'2013-02-24 18:29:15'),(87434,'smartphone',1,NULL,'top','members',0,NULL,NULL,15,'/adherents/index.php?mainmenu=members&amp;leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(87435,'smartphone',1,NULL,'top','bank',0,NULL,NULL,6,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(87521,'smartphone',1,NULL,'left','home',87422,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87522,'smartphone',1,NULL,'left','home',87521,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87523,'smartphone',1,NULL,'left','home',87521,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87524,'smartphone',1,NULL,'left','home',87521,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87525,'smartphone',1,NULL,'left','home',87521,NULL,NULL,5,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87526,'smartphone',1,NULL,'left','home',87521,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87527,'smartphone',1,NULL,'left','home',87521,NULL,NULL,6,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87529,'smartphone',1,NULL,'left','home',87521,NULL,NULL,7,'/admin/perms.php?leftmenu=setup','','Security','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87530,'smartphone',1,NULL,'left','home',87521,NULL,NULL,9,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87531,'smartphone',1,NULL,'left','home',87521,NULL,NULL,8,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87532,'smartphone',1,NULL,'left','home',87521,NULL,NULL,10,'/admin/dict.php?leftmenu=setup','','DictionarySetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87533,'smartphone',1,NULL,'left','home',87521,NULL,NULL,11,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87621,'smartphone',1,NULL,'left','home',87422,NULL,NULL,1,'/admin/system/index.php?leftmenu=system','','SystemInfo','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87622,'smartphone',1,NULL,'left','home',87621,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=system','','Dolibarr','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87623,'smartphone',1,NULL,'left','home',87622,NULL,NULL,1,'/admin/system/constall.php?leftmenu=system','','AllParameters','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87624,'smartphone',1,NULL,'left','home',87622,NULL,NULL,4,'/admin/system/about.php?leftmenu=system','','About','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87625,'smartphone',1,NULL,'left','home',87621,NULL,NULL,1,'/admin/system/os.php?leftmenu=system','','OS','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87626,'smartphone',1,NULL,'left','home',87621,NULL,NULL,2,'/admin/system/web.php?leftmenu=system','','WebServer','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87627,'smartphone',1,NULL,'left','home',87621,NULL,NULL,3,'/admin/system/phpinfo.php?leftmenu=system','','Php','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87628,'smartphone',1,NULL,'left','home',87622,NULL,NULL,3,'/admin/triggers.php?leftmenu=system','','Triggers','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87629,'smartphone',1,NULL,'left','home',87622,NULL,NULL,2,'/admin/system/modules.php?leftmenu=system','','Modules','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87631,'smartphone',1,NULL,'left','home',87621,NULL,NULL,4,'/admin/system/database.php?leftmenu=system','','Database','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87632,'smartphone',1,NULL,'left','home',87631,NULL,NULL,0,'/admin/system/database-tables.php?leftmenu=system','','Tables','admin',2,'','','1',2,'2013-02-24 18:29:15'),(87721,'smartphone',1,NULL,'left','home',87422,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'','','$user->admin',2,'2013-02-24 18:29:15'),(87722,'smartphone',1,NULL,'left','home',87721,NULL,NULL,0,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87723,'smartphone',1,NULL,'left','home',87721,NULL,NULL,1,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87724,'smartphone',1,NULL,'left','home',87721,NULL,NULL,6,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87725,'smartphone',1,NULL,'left','home',87721,NULL,NULL,3,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','1 && function_exists(\'eaccelerator_info\')',2,'2013-02-24 18:29:15'),(87726,'smartphone',1,NULL,'left','home',87721,NULL,NULL,2,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87727,'smartphone',1,NULL,'left','home',87721,NULL,NULL,4,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87728,'smartphone',1,NULL,'left','home',87721,NULL,NULL,7,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','1',2,'2013-02-24 18:29:15'),(87729,'smartphone',1,NULL,'left','home',87721,NULL,NULL,5,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','1',2,'2013-02-24 18:29:15'),(87821,'smartphone',1,NULL,'left','home',87422,NULL,NULL,3,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'','','1',2,'2013-02-24 18:29:15'),(87822,'smartphone',1,NULL,'left','home',87821,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','1',2,'2013-02-24 18:29:15'),(87823,'smartphone',1,NULL,'left','home',87822,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','1',2,'2013-02-24 18:29:15'),(87824,'smartphone',1,NULL,'left','home',87821,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','1',2,'2013-02-24 18:29:15'),(87825,'smartphone',1,NULL,'left','home',87824,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','1',2,'2013-02-24 18:29:15'),(87921,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,0,'/societe/societe.php','','ThirdParty','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87922,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87924,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,5,'/fourn/list.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87925,'smartphone',1,NULL,'left','companies',87924,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(87927,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87928,'smartphone',1,NULL,'left','companies',87927,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87930,'smartphone',1,NULL,'left','companies',87921,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(87931,'smartphone',1,NULL,'left','companies',87930,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88021,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses||Contacts@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88022,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88023,'smartphone',1,NULL,'left','companies',88021,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88025,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','Prospects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88026,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','Customers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88027,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','Suppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(88028,'smartphone',1,NULL,'left','companies',88023,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(88071,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88072,'smartphone',1,NULL,'left','companies',88071,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88081,'smartphone',1,NULL,'left','companies',87423,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88082,'smartphone',1,NULL,'left','companies',88081,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(88121,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,1,'/comm/prospect/index.php?leftmenu=prospects','','Prospects','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88122,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88123,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,1,'/comm/prospect/list.php?leftmenu=prospects','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88124,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,0,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=-1','','LastProspectDoNotContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88125,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,1,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=0','','LastProspectNeverContacted','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88126,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,2,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=1','','LastProspectToContact','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88127,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,3,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=2','','LastProspectContactInProcess','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88128,'smartphone',1,NULL,'left','commercial',88123,NULL,NULL,4,'/comm/prospect/list.php?sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;stcomm=3','','LastProspectContactDone','companies',2,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88129,'smartphone',1,NULL,'left','commercial',88121,NULL,NULL,2,'/contact/list.php?leftmenu=prospects&amp;type=p','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88221,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,2,'/comm/index.php?leftmenu=customers','','Customers','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88222,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88223,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,1,'/comm/list.php?leftmenu=customers','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88224,'smartphone',1,NULL,'left','commercial',88221,NULL,NULL,2,'/contact/list.php?leftmenu=customers&amp;type=c','','Contacts','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88321,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,3,'/contact/list.php?leftmenu=contacts','','Contacts','companies',0,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88322,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress||NewContact@$conf->global->SOCIETE_ADDRESSES_MANAGEMENT','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88323,'smartphone',1,NULL,'left','commercial',88321,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',0,'2013-02-24 18:29:15'),(88331,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','Prospects','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88332,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=c','','Customers','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88333,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=f','','Suppliers','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88334,'smartphone',1,NULL,'left','commercial',88323,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=o','','Other','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled && $leftmenu==\"prospects\"',0,'2013-02-24 18:29:15'),(88521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,4,'/comm/propal.php?leftmenu=propals','','Prop','propal',0,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(88522,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,0,'/societe/societe.php?leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88523,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,1,'/comm/propal.php?viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88524,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,2,'/comm/propal.php?viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88525,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,3,'/comm/propal.php?viewstatut=2,3,4','','PropalStatusClosedShort','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88526,'smartphone',1,NULL,'left','commercial',88521,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2013-02-24 18:29:15'),(88621,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(88622,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,0,'/societe/societe.php?leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88623,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88624,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88625,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88626,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88627,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88628,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88629,'smartphone',1,NULL,'left','commercial',88623,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88630,'smartphone',1,NULL,'left','commercial',88621,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2013-02-24 18:29:15'),(88721,'smartphone',1,NULL,'left','commercial',87424,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','orders',0,'','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2013-02-24 18:29:15'),(88722,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,0,'/expedition/list.php?leftmenu=sendings','','List','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88723,'smartphone',1,NULL,'left','commercial',88721,NULL,NULL,1,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','orders',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2013-02-24 18:29:15'),(88821,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88822,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,0,'/societe/societe.php?leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88823,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88824,'smartphone',1,NULL,'left','commercial',88821,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2013-02-24 18:29:15'),(88825,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88826,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88827,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88828,'smartphone',1,NULL,'left','commercial',88824,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2013-02-24 18:29:15'),(88921,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2013-02-24 18:29:15'),(88922,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(88923,'smartphone',1,NULL,'left','commercial',88921,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled && $leftmenu==\"ficheinter\"',2,'2013-02-24 18:29:15'),(89021,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/fourn/facture/index.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89022,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89023,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89024,'smartphone',1,NULL,'left','accountancy',89021,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(89121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89122,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,3,'/compta/clients.php?action=facturer&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89123,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,4,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','Repeatable','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89124,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,5,'/compta/facture/impayees.php?action=facturer&amp;leftmenu=customers_bills','','Unpaid','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89125,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89131,'smartphone',1,NULL,'left','accountancy',89125,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->societe->enabled',2,'2013-02-24 18:29:15'),(89132,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89133,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89134,'smartphone',1,NULL,'left','accountancy',89132,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89135,'smartphone',1,NULL,'left','accountancy',89121,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled && $conf->banque->enabled',2,'2013-02-24 18:29:15'),(89321,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'','$user->rights->commande->lire','$conf->commande->enabled',0,'2013-02-24 18:29:15'),(89421,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,4,'/compta/dons/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'','$user->rights->don->lire','$conf->don->enabled',2,'2013-02-24 18:29:15'),(89422,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,0,'/compta/dons/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89423,'smartphone',1,NULL,'left','accountancy',89421,NULL,NULL,1,'/compta/dons/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2013-02-24 18:29:15'),(89521,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2013-02-24 18:29:15'),(89522,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89523,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89524,'smartphone',1,NULL,'left','accountancy',89521,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled && $leftmenu==\"tripsandexpenses\"',0,'2013-02-24 18:29:15'),(89621,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuTaxAndDividends','compta',0,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89622,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2013-02-24 18:29:15'),(89623,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89624,'smartphone',1,NULL,'left','accountancy',89622,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2013-02-24 18:29:15'),(89721,'smartphone',1,NULL,'left','accountancy',89621,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2013-02-24 18:29:15'),(89722,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89723,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89724,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89725,'smartphone',1,NULL,'left','accountancy',89721,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2013-02-24 18:29:15'),(89821,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,8,'/compta/ventilation/index.php?leftmenu=ventil','','Ventilation','companies',0,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89822,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,0,'/compta/ventilation/list.php','','ToDispatch','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89823,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,1,'/compta/ventilation/lignes.php','','Dispatched','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89824,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,2,'/compta/param/','','Setup','companies',1,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89825,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,0,'/compta/param/comptes/list.php','','List','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89826,'smartphone',1,NULL,'left','accountancy',89824,NULL,NULL,1,'/compta/param/comptes/card.php?action=create','','New','companies',2,'','$user->rights->compta->ventilation->parametrer','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89827,'smartphone',1,NULL,'left','accountancy',89821,NULL,NULL,3,'/compta/export/','','Export','companies',1,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89828,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,0,'/compta/export/index.php','','New','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89829,'smartphone',1,NULL,'left','accountancy',89827,NULL,NULL,1,'/compta/export/list.php','','List','companies',2,'','$user->rights->compta->ventilation->lire','$conf->comptabilite->enabled && $conf->global->FACTURE_VENTILATION',0,'2013-02-24 18:29:15'),(89921,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2013-02-24 18:29:15'),(89922,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,1,'/compta/prelevement/demandes.php?status=0&amp;leftmenu=withdraw','','StandingOrderToProcess','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89923,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89924,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89925,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89927,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(89928,'smartphone',1,NULL,'left','accountancy',89921,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2013-02-24 18:29:15'),(90021,'smartphone',1,NULL,'left','accountancy',87435,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'','$user->rights->banque->lire','$conf->banque->enabled',0,'2013-02-24 18:29:15'),(90022,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90023,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90024,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90025,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90027,'smartphone',1,NULL,'left','accountancy',90021,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && $leftmenu==bank',0,'2013-02-24 18:29:15'),(90121,'smartphone',1,NULL,'left','accountancy',87427,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90122,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90123,'smartphone',1,NULL,'left','accountancy',90122,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90124,'smartphone',1,NULL,'left','accountancy',90121,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90125,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90126,'smartphone',1,NULL,'left','accountancy',90124,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2013-02-24 18:29:15'),(90221,'smartphone',1,NULL,'left','products',87424,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90222,'smartphone',1,NULL,'left','products',90221,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90223,'smartphone',1,NULL,'left','products',90221,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90224,'smartphone',1,NULL,'left','products',90221,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2013-02-24 18:29:15'),(90321,'smartphone',1,NULL,'left','products',87424,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90322,'smartphone',1,NULL,'left','products',90321,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90323,'smartphone',1,NULL,'left','products',90321,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2013-02-24 18:29:15'),(90421,'smartphone',1,NULL,'left','products',87424,NULL,NULL,2,'/product/stats/index.php?leftmenu=stats','','Statistics','main',0,'','$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',2,'2013-02-24 18:29:15'),(90422,'smartphone',1,NULL,'left','products',90421,NULL,NULL,0,'/product/popuprop.php?leftmenu=stats','','Popularity','main',1,'','$user->rights->produit->lire && $user->rights->produit>lire','$conf->propal->enabled',2,'2013-02-24 18:29:15'),(90521,'smartphone',1,NULL,'left','products',87424,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90522,'smartphone',1,NULL,'left','products',90521,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90523,'smartphone',1,NULL,'left','products',90521,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90524,'smartphone',1,NULL,'left','products',90521,NULL,NULL,2,'/product/stock/valo.php','','EnhancedValue','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90525,'smartphone',1,NULL,'left','products',90521,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2013-02-24 18:29:15'),(90621,'smartphone',1,NULL,'left','products',87424,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(90622,'smartphone',1,NULL,'left','products',90621,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2013-02-24 18:29:15'),(91021,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91022,'smartphone',1,NULL,'left','project',91021,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91023,'smartphone',1,NULL,'left','project',91021,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91031,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91032,'smartphone',1,NULL,'left','project',91031,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91033,'smartphone',1,NULL,'left','project',91031,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91121,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91122,'smartphone',1,NULL,'left','project',91121,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91123,'smartphone',1,NULL,'left','project',91121,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91124,'smartphone',1,NULL,'left','project',91121,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91221,'smartphone',1,NULL,'left','project',87428,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91222,'smartphone',1,NULL,'left','project',91221,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91223,'smartphone',1,NULL,'left','project',91221,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91224,'smartphone',1,NULL,'left','project',91221,NULL,NULL,3,'/projet/activity/list.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2013-02-24 18:29:15'),(91321,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91322,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91323,'smartphone',1,NULL,'left','tools',91321,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2013-02-24 18:29:15'),(91521,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'','$user->rights->export->lire','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91522,'smartphone',1,NULL,'left','tools',91521,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2013-02-24 18:29:15'),(91551,'smartphone',1,NULL,'left','tools',87429,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91552,'smartphone',1,NULL,'left','tools',91551,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2013-02-24 18:29:15'),(91621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91622,'smartphone',1,NULL,'left','members',91621,NULL,NULL,0,'/adherents/card.php?action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91623,'smartphone',1,NULL,'left','members',91621,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91624,'smartphone',1,NULL,'left','members',91623,NULL,NULL,2,'/adherents/list.php?statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91625,'smartphone',1,NULL,'left','members',91623,NULL,NULL,3,'/adherents/list.php?statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91626,'smartphone',1,NULL,'left','members',91623,NULL,NULL,4,'/adherents/list.php?statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91627,'smartphone',1,NULL,'left','members',91623,NULL,NULL,5,'/adherents/list.php?statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91628,'smartphone',1,NULL,'left','members',91623,NULL,NULL,6,'/adherents/list.php?statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91721,'smartphone',1,NULL,'left','members',87434,NULL,NULL,1,'/adherents/index.php?leftmenu=accountancy&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91722,'smartphone',1,NULL,'left','members',91721,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91723,'smartphone',1,NULL,'left','members',91721,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=accountancy','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91921,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91922,'smartphone',1,NULL,'left','members',91921,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2013-02-24 18:29:15'),(91923,'smartphone',1,NULL,'left','members',91921,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(91924,'smartphone',1,NULL,'left','members',91921,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92121,'smartphone',1,NULL,'left','members',87434,NULL,NULL,5,'/adherents/index.php?leftmenu=setup&amp;mainmenu=members','','Setup','members',0,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92122,'smartphone',1,NULL,'left','members',92121,NULL,NULL,0,'/adherents/type.php?leftmenu=setup','','MembersTypes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92123,'smartphone',1,NULL,'left','members',92121,NULL,NULL,1,'/adherents/options.php?leftmenu=setup','','MembersAttributes','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2013-02-24 18:29:15'),(92421,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,0,'/compta/index.php?leftmenu=suppliers','','Suppliers','companies',0,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92422,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,0,'/societe/soc.php?leftmenu=suppliers&amp;action=create&amp;type=f','','NewSupplier','companies',1,'','$user->rights->societe->creer && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92423,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,1,'/fourn/list.php?leftmenu=suppliers','','List','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92424,'smartphone',1,NULL,'left','commercial',92421,NULL,NULL,2,'/contact/list.php?leftmenu=suppliers&amp;type=f','','Contacts','companies',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->fournisseur->enabled',2,'2013-02-24 18:29:15'),(92521,'smartphone',1,NULL,'left','commercial',87426,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled',2,'2013-02-24 18:29:15'),(92522,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,0,'/societe/societe.php?leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92523,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92529,'smartphone',1,NULL,'left','commercial',92521,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->commande->enabled && $leftmenu==\"orders_suppliers\"',2,'2013-02-24 18:29:15'),(92621,'smartphone',1,NULL,'left','members',87434,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(92622,'smartphone',1,NULL,'left','members',92621,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2013-02-24 18:29:15'),(103094,'all',2,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103095,'all',2,'agenda','left','agenda',103094,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103096,'all',2,'agenda','left','agenda',103095,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103097,'all',2,'agenda','left','agenda',103095,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Calendar','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103098,'all',2,'agenda','left','agenda',103097,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103099,'all',2,'agenda','left','agenda',103097,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103100,'all',2,'agenda','left','agenda',103097,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103101,'all',2,'agenda','left','agenda',103097,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103102,'all',2,'agenda','left','agenda',103095,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103103,'all',2,'agenda','left','agenda',103102,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103104,'all',2,'agenda','left','agenda',103102,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103105,'all',2,'agenda','left','agenda',103102,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103106,'all',2,'agenda','left','agenda',103102,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2013-03-13 15:29:19'),(103107,'all',2,'agenda','left','agenda',103095,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2013-03-13 15:29:19'),(103108,'all',2,'pos','top','pos',0,NULL,NULL,100,'/pos/backend/listefac.php','','POS','pos@pos',NULL,'1','1','1',2,'2013-03-13 20:33:09'),(103109,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/list.php','','Tickets','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103110,'all',2,'pos','left','pos',103109,NULL,NULL,100,'/pos/backend/list.php','','List','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103111,'all',2,'pos','left','pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=0','','StatusTicketDraft','pos@pos',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103112,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=1','','StatusTicketClosed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103113,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewstatut=2','','StatusTicketProcessed','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103114,'all',2,'pos','left','@pos',103110,NULL,NULL,100,'/pos/backend/list.php?viewtype=1','','StatusTicketReturned','main',NULL,NULL,'$user->rights->pos->backend','$conf->global->POS_USE_TICKETS',0,'2013-03-13 20:33:09'),(103115,'all',2,'pos','left','pos',103108,NULL,NULL,100,'/pos/backend/listefac.php','','Factures','pos@pos',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103116,'all',2,'pos','left','pos',103115,NULL,NULL,100,'/pos/backend/listefac.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103117,'all',2,'pos','left','pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=0','','BillStatusDraft','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103118,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=1','','BillStatusValidated','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103119,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewstatut=2&viewtype=0','','BillStatusPaid','bills',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103120,'all',2,'pos','left','@pos',103116,NULL,NULL,100,'/pos/backend/listefac.php?viewtype=2','','BillStatusReturned','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103121,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/frontend/index.php','','POS','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103122,'all',2,'pos','left','@pos',103121,NULL,NULL,100,'/pos/frontend/index.php','','NewTicket','main',NULL,NULL,'$user->rights->pos->frontend','1',0,'2013-03-13 20:33:09'),(103123,'all',2,'pos','left','@pos',103121,NULL,NULL,101,'/pos/backend/closes.php','','CloseandArching','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103124,'all',2,'pos','left','@pos',103108,NULL,NULL,100,'/pos/backend/terminal/cash.php','','Terminal','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103125,'all',2,'pos','left','@pos',103124,NULL,NULL,100,'/pos/backend/terminal/card.php?action=create','','NewCash','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103126,'all',2,'pos','left','@pos',103124,NULL,NULL,101,'/pos/backend/terminal/cash.php','','List','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103127,'all',2,'pos','left','@pos',103123,NULL,NULL,101,'/pos/backend/closes.php?viewstatut=0','','Arqueo','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103128,'all',2,'pos','left','@pos',103123,NULL,NULL,102,'/pos/backend/closes.php?viewstatut=1','','Closes','main',NULL,NULL,'$user->rights->pos->backend','1',0,'2013-03-13 20:33:09'),(103129,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/transfers.php','','Transfer','main',NULL,NULL,'$user->rights->pos->transfer','1',0,'2013-03-13 20:33:09'),(103130,'all',2,'pos','left','@pos',103108,NULL,NULL,102,'/pos/backend/resultat/index.php','','Rapport','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103131,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/casoc.php','','ReportsCustomer','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103132,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/causer.php','','ReportsUser','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103133,'all',2,'pos','left','@pos',103130,NULL,NULL,102,'/pos/backend/resultat/sellsjournal.php','','ReportsSells','main',NULL,NULL,'$user->rights->pos->stats','1',0,'2013-03-13 20:33:09'),(103134,'all',2,'opensurvey','top','opensurvey',0,NULL,NULL,200,'/opensurvey/index.php','','Surveys','opensurvey',NULL,NULL,'$user->rights->opensurvey->survey->read','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103135,'all',2,'opensurvey','left','opensurvey',-1,NULL,'opensurvey',200,'/opensurvey/index.php?mainmenu=opensurvey&leftmenu=opensurvey','','Survey','opensurvey@opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103136,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',210,'/opensurvey/public/index.php','_blank','NewSurvey','opensurvey@opensurvey',NULL,'opensurvey_new','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(103137,'all',2,'opensurvey','left','opensurvey',-1,'opensurvey','opensurvey',220,'/opensurvey/list.php','','List','opensurvey@opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2013-03-13 20:33:42'),(113729,'all',1,'agenda','top','agenda',0,NULL,NULL,100,'/comm/action/index.php','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113730,'all',1,'agenda','left','agenda',113729,NULL,NULL,100,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Actions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113731,'all',1,'agenda','left','agenda',113730,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113732,'all',1,'agenda','left','agenda',113730,NULL,NULL,102,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Agenda','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113733,'all',1,'agenda','left','agenda',113732,NULL,NULL,103,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113734,'all',1,'agenda','left','agenda',113732,NULL,NULL,104,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113735,'all',1,'agenda','left','agenda',113732,NULL,NULL,105,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-29 18:14:51'),(113736,'all',1,'agenda','left','agenda',113732,NULL,NULL,106,'/comm/action/index.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-29 18:14:51'),(113737,'all',1,'agenda','left','agenda',113730,NULL,NULL,112,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda','','List','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113738,'all',1,'agenda','left','agenda',113737,NULL,NULL,113,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113739,'all',1,'agenda','left','agenda',113737,NULL,NULL,114,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113740,'all',1,'agenda','left','agenda',113737,NULL,NULL,115,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo','','MenuToDoActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-29 18:14:51'),(113741,'all',1,'agenda','left','agenda',113737,NULL,NULL,116,'/comm/action/listactions.php?mainmenu=agenda&amp;leftmenu=agenda&amp;status=done','','MenuDoneActions','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$user->rights->agenda->allactions->read',2,'2015-10-29 18:14:51'),(113742,'all',1,'agenda','left','agenda',113730,NULL,NULL,120,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2015-10-29 18:14:51'),(113743,'all',1,'barcode','left','tools',-1,NULL,'tools',200,'/barcode/printsheet.php?mainmenu=tools&leftmenu=barcodeprint','','BarCodePrintsheet','products',NULL,'barcodeprint','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2015-10-29 18:14:51'),(113744,'all',1,'barcode','left','home',-1,'modulesadmintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=modulesadmintools','','MassBarcodeInit','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && $leftmenu==\"modulesadmintools\"',0,'2015-10-29 18:14:51'),(113745,'all',1,'cron','left','home',-1,'modulesadmintools','home',200,'/cron/list.php?status=-1','','CronList','cron',NULL,NULL,'$user->rights->cron->read','$leftmenu==\'modulesadmintools\'',2,'2015-10-29 18:14:51'),(113746,'all',1,'ecm','top','ecm',0,NULL,NULL,100,'/ecm/index.php','','MenuECM','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload || $user->rights->ecm->setup','$conf->ecm->enabled',2,'2015-10-29 18:14:51'),(113747,'all',1,'ecm','left','ecm',-1,NULL,'ecm',101,'/ecm/index.php?mainmenu=ecm&leftmenu=ecm','','ECMArea','ecm',NULL,'ecm','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-29 18:14:51'),(113748,'all',1,'ecm','left','ecm',-1,'ecm','ecm',102,'/ecm/index.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsManual','ecm',NULL,'ecm_manual','$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-29 18:14:51'),(113749,'all',1,'ecm','left','ecm',-1,'ecm','ecm',103,'/ecm/index_auto.php?action=file_manager&mainmenu=ecm&leftmenu=ecm','','ECMSectionsAuto','ecm',NULL,NULL,'$user->rights->ecm->read || $user->rights->ecm->upload','$user->rights->ecm->read || $user->rights->ecm->upload',2,'2015-10-29 18:14:51'),(113750,'all',1,'opensurvey','left','tools',-1,NULL,'tools',200,'/opensurvey/index.php?mainmenu=tools&leftmenu=opensurvey','','Survey','opensurvey',NULL,'opensurvey','','$conf->opensurvey->enabled',0,'2015-10-29 18:14:52'),(113751,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',210,'/opensurvey/wizard/index.php','','NewSurvey','opensurvey',NULL,'opensurvey_new','$user->rights->opensurvey->write','$conf->opensurvey->enabled',0,'2015-10-29 18:14:52'),(113752,'all',1,'opensurvey','left','tools',-1,'opensurvey','tools',220,'/opensurvey/list.php','','List','opensurvey',NULL,'opensurvey_list','','$conf->opensurvey->enabled',0,'2015-10-29 18:14:52'),(113753,'auguria',1,'','top','home',0,NULL,NULL,10,'/index.php?mainmenu=home&amp;leftmenu=','','Home','',-1,'','','1',2,'2015-10-29 18:14:52'),(113754,'auguria',1,'societe|fournisseur','top','companies',0,NULL,NULL,20,'/societe/index.php?mainmenu=companies&amp;leftmenu=','','ThirdParties','companies',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)',2,'2015-10-29 18:14:52'),(113755,'auguria',1,'product|service','top','products',0,NULL,NULL,30,'/product/index.php?mainmenu=products&amp;leftmenu=','','Products/Services','products',-1,'','$user->rights->produit->lire||$user->rights->service->lire','$conf->product->enabled || $conf->service->enabled',0,'2015-10-29 18:14:52'),(113757,'auguria',1,'propal|commande|fournisseur|contrat|ficheinter','top','commercial',0,NULL,NULL,40,'/comm/index.php?mainmenu=commercial&amp;leftmenu=','','Commercial','commercial',-1,'','$user->rights->societe->lire || $user->rights->societe->contact->lire','$conf->propal->enabled || $conf->commande->enabled || $conf->fournisseur->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled',2,'2015-10-29 18:14:52'),(113758,'auguria',1,'comptabilite|accounting|facture|deplacement|don|tax|salaries|loa','top','accountancy',0,NULL,NULL,50,'/compta/index.php?mainmenu=accountancy&amp;leftmenu=','','MenuFinancial','compta',-1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $u','$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled  || $conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled',2,'2015-10-29 18:14:52'),(113759,'auguria',1,'projet','top','project',0,NULL,NULL,70,'/projet/index.php?mainmenu=project&amp;leftmenu=','','Projects','projects',-1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(113760,'auguria',1,'mailing|export|import|opensurvey','top','tools',0,NULL,NULL,90,'/core/tools.php?mainmenu=tools&amp;leftmenu=','','Tools','other',-1,'','$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read','$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled',2,'2015-10-29 18:14:52'),(113765,'auguria',1,'adherent','top','members',0,NULL,NULL,110,'/adherents/index.php?mainmenu=members&amp;leftmenu=','','Members','members',-1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(113766,'auguria',1,'banque|prelevement','top','bank',0,NULL,NULL,60,'/compta/bank/index.php?mainmenu=bank&amp;leftmenu=bank','','MenuBankCash','banks',-1,'','$user->rights->banque->lire || $user->rights->prelevement->bons->lire','$conf->banque->enabled || $conf->prelevement->enabled',0,'2015-10-29 18:14:52'),(113767,'auguria',1,'hrm','top','hrm',0,NULL,NULL,80,'/compta/hrm.php?mainmenu=hrm&amp;leftmenu=','','HRM','holiday',-1,'','$user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire','$conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled',0,'2015-10-29 18:14:52'),(113852,'auguria',1,'','left','home',113753,NULL,NULL,0,'/admin/index.php?leftmenu=setup','','Setup','admin',0,'setup','','$user->admin',2,'2015-10-29 18:14:52'),(113853,'auguria',1,'','left','home',113852,NULL,NULL,1,'/admin/company.php?leftmenu=setup','','MenuCompanySetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113854,'auguria',1,'','left','home',113852,NULL,NULL,4,'/admin/ihm.php?leftmenu=setup','','GUISetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113855,'auguria',1,'','left','home',113852,NULL,NULL,2,'/admin/modules.php?leftmenu=setup','','Modules','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113856,'auguria',1,'','left','home',113852,NULL,NULL,6,'/admin/boxes.php?leftmenu=setup','','Boxes','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113857,'auguria',1,'','left','home',113852,NULL,NULL,3,'/admin/menus.php?leftmenu=setup','','Menus','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113858,'auguria',1,'','left','home',113852,NULL,NULL,7,'/admin/delais.php?leftmenu=setup','','Alerts','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113859,'auguria',1,'','left','home',113852,NULL,NULL,10,'/admin/pdf.php?leftmenu=setup','','PDF','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113860,'auguria',1,'','left','home',113852,NULL,NULL,8,'/admin/security_other.php?leftmenu=setup','','Security','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113861,'auguria',1,'','left','home',113852,NULL,NULL,11,'/admin/mails.php?leftmenu=setup','','Emails','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113862,'auguria',1,'','left','home',113852,NULL,NULL,9,'/admin/limits.php?leftmenu=setup','','MenuLimits','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113863,'auguria',1,'','left','home',113852,NULL,NULL,13,'/admin/dict.php?leftmenu=setup','','Dictionary','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113864,'auguria',1,'','left','home',113852,NULL,NULL,14,'/admin/const.php?leftmenu=setup','','OtherSetup','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113865,'auguria',1,'','left','home',113852,NULL,NULL,12,'/admin/sms.php?leftmenu=setup','','SMS','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113866,'auguria',1,'','left','home',113852,NULL,NULL,4,'/admin/translation.php?leftmenu=setup','','Translation','admin',1,'','','$leftmenu==\"setup\"',2,'2015-10-29 18:14:52'),(113953,'auguria',1,'','left','home',114052,NULL,NULL,0,'/admin/system/dolibarr.php?leftmenu=admintools','','InfoDolibarr','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113954,'auguria',1,'','left','home',113953,NULL,NULL,2,'/admin/system/modules.php?leftmenu=admintools','','Modules','admin',2,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113955,'auguria',1,'','left','home',113953,NULL,NULL,3,'/admin/triggers.php?leftmenu=admintools','','Triggers','admin',2,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113957,'auguria',1,'','left','home',114052,NULL,NULL,1,'/admin/system/browser.php?leftmenu=admintools','','InfoBrowser','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113958,'auguria',1,'','left','home',114052,NULL,NULL,2,'/admin/system/os.php?leftmenu=admintools','','InfoOS','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113959,'auguria',1,'','left','home',114052,NULL,NULL,3,'/admin/system/web.php?leftmenu=admintools','','InfoWebServer','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113960,'auguria',1,'','left','home',114052,NULL,NULL,4,'/admin/system/phpinfo.php?leftmenu=admintools','','InfoPHP','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(113962,'auguria',1,'','left','home',114052,NULL,NULL,5,'/admin/system/database.php?leftmenu=admintools','','InfoDatabase','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114052,'auguria',1,'','left','home',113753,NULL,NULL,2,'/admin/tools/index.php?leftmenu=admintools','','SystemTools','admin',0,'admintools','','$user->admin',2,'2015-10-29 18:14:52'),(114053,'auguria',1,'','left','home',114052,NULL,NULL,6,'/admin/tools/dolibarr_export.php?leftmenu=admintools','','Backup','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114054,'auguria',1,'','left','home',114052,NULL,NULL,7,'/admin/tools/dolibarr_import.php?leftmenu=admintools','','Restore','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114057,'auguria',1,'','left','home',114052,NULL,NULL,8,'/admin/tools/update.php?leftmenu=admintools','','MenuUpgrade','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114058,'auguria',1,'','left','home',114052,NULL,NULL,9,'/admin/tools/eaccelerator.php?leftmenu=admintools','','EAccelerator','admin',1,'','','$leftmenu==\"admintools\" && function_exists(\"eaccelerator_info\")',2,'2015-10-29 18:14:52'),(114059,'auguria',1,'','left','home',114052,NULL,NULL,10,'/admin/tools/listevents.php?leftmenu=admintools','','Audit','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114060,'auguria',1,'','left','home',114052,NULL,NULL,11,'/admin/tools/listsessions.php?leftmenu=admintools','','Sessions','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114061,'auguria',1,'','left','home',114052,NULL,NULL,12,'/admin/tools/purge.php?leftmenu=admintools','','Purge','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114062,'auguria',1,'','left','home',114052,NULL,NULL,13,'/support/index.php?leftmenu=admintools','_blank','HelpCenter','help',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114063,'auguria',1,'','left','home',114052,NULL,NULL,14,'/admin/system/about.php?leftmenu=admintools','','About','admin',1,'','','$leftmenu==\"admintools\"',2,'2015-10-29 18:14:52'),(114152,'auguria',1,'','left','home',113753,NULL,NULL,4,'/user/home.php?leftmenu=users','','MenuUsersAndGroups','users',0,'users','','1',2,'2015-10-29 18:14:52'),(114153,'auguria',1,'','left','home',114152,NULL,NULL,0,'/user/index.php?leftmenu=users','','Users','users',1,'','$user->rights->user->user->lire || $user->admin','$leftmenu==\"users\"',2,'2015-10-29 18:14:52'),(114154,'auguria',1,'','left','home',114153,NULL,NULL,0,'/user/card.php?leftmenu=users&amp;action=create','','NewUser','users',2,'','$user->rights->user->user->creer || $user->admin','$leftmenu==\"users\"',2,'2015-10-29 18:14:52'),(114155,'auguria',1,'','left','home',114152,NULL,NULL,1,'/user/group/index.php?leftmenu=users','','Groups','users',1,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->read:$user->rights->user->user->lire) || $user->admin','$leftmenu==\"users\"',2,'2015-10-29 18:14:52'),(114156,'auguria',1,'','left','home',114155,NULL,NULL,0,'/user/group/card.php?leftmenu=users&amp;action=create','','NewGroup','users',2,'','($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->user->group_advance->write:$user->rights->user->user->creer) || $user->admin','$leftmenu==\"users\"',2,'2015-10-29 18:14:52'),(114252,'auguria',1,'','left','companies',113754,NULL,NULL,0,'/societe/index.php?leftmenu=thirdparties','','ThirdParty','companies',0,'thirdparties','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114253,'auguria',1,'','left','companies',114252,NULL,NULL,0,'/societe/soc.php?action=create','','MenuNewThirdParty','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114254,'auguria',1,'','left','companies',114252,NULL,NULL,0,'/societe/list.php?action=create','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114255,'auguria',1,'','left','companies',114252,NULL,NULL,5,'/fourn/list.php?leftmenu=suppliers','','ListSuppliersShort','suppliers',1,'','$user->rights->societe->lire && $user->rights->fournisseur->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(114256,'auguria',1,'','left','companies',114255,NULL,NULL,0,'/societe/soc.php?leftmenu=supplier&amp;action=create&amp;type=f','','NewSupplier','suppliers',2,'','$user->rights->societe->creer','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(114258,'auguria',1,'','left','companies',114252,NULL,NULL,3,'/comm/prospect/list.php?leftmenu=prospects','','ListProspectsShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114259,'auguria',1,'','left','companies',114258,NULL,NULL,0,'/societe/soc.php?leftmenu=prospects&amp;action=create&amp;type=p','','MenuNewProspect','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114261,'auguria',1,'','left','companies',114252,NULL,NULL,4,'/comm/list.php?leftmenu=customers','','ListCustomersShort','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114262,'auguria',1,'','left','companies',114261,NULL,NULL,0,'/societe/soc.php?leftmenu=customers&amp;action=create&amp;type=c','','MenuNewCustomer','companies',2,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114352,'auguria',1,'','left','companies',113754,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','ContactsAddresses','companies',0,'contacts','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114353,'auguria',1,'','left','companies',114352,NULL,NULL,0,'/contact/card.php?leftmenu=contacts&amp;action=create','','NewContactAddress','companies',1,'','$user->rights->societe->creer','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114354,'auguria',1,'','left','companies',114352,NULL,NULL,1,'/contact/list.php?leftmenu=contacts','','List','companies',1,'','$user->rights->societe->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114356,'auguria',1,'','left','companies',114354,NULL,NULL,1,'/contact/list.php?leftmenu=contacts&amp;type=p','','ThirdPartyProspects','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114357,'auguria',1,'','left','companies',114354,NULL,NULL,2,'/contact/list.php?leftmenu=contacts&amp;type=c','','ThirdPartyCustomers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114358,'auguria',1,'','left','companies',114354,NULL,NULL,3,'/contact/list.php?leftmenu=contacts&amp;type=f','','ThirdPartySuppliers','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled && $conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(114359,'auguria',1,'','left','companies',114354,NULL,NULL,4,'/contact/list.php?leftmenu=contacts&amp;type=o','','Others','companies',2,'','$user->rights->societe->contact->lire','$conf->societe->enabled',2,'2015-10-29 18:14:52'),(114402,'auguria',1,'','left','companies',113754,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=1','','SuppliersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114403,'auguria',1,'','left','companies',114402,NULL,NULL,0,'/categories/card.php?action=create&amp;type=1','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114412,'auguria',1,'','left','companies',113754,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=2','','CustomersProspectsCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114413,'auguria',1,'','left','companies',114412,NULL,NULL,0,'/categories/card.php?action=create&amp;type=2','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->fournisseur->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114422,'auguria',1,'','left','companies',113754,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=4','','ContactCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114423,'auguria',1,'','left','companies',114422,NULL,NULL,0,'/categories/card.php?action=create&amp;type=4','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->societe->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(114852,'auguria',1,'','left','commercial',113757,NULL,NULL,4,'/comm/propal/index.php?leftmenu=propals','','Prop','propal',0,'propals','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(114853,'auguria',1,'','left','commercial',114852,NULL,NULL,0,'/comm/propal.php?action=create&amp;leftmenu=propals','','NewPropal','propal',1,'','$user->rights->propale->creer','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(114854,'auguria',1,'','left','commercial',114852,NULL,NULL,1,'/comm/propal/list.php?leftmenu=propals','','List','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(114855,'auguria',1,'','left','commercial',114854,NULL,NULL,2,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=0','','PropalsDraft','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-29 18:14:52'),(114856,'auguria',1,'','left','commercial',114854,NULL,NULL,3,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=1','','PropalsOpened','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-29 18:14:52'),(114857,'auguria',1,'','left','commercial',114854,NULL,NULL,4,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=2','','PropalStatusSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-29 18:14:52'),(114858,'auguria',1,'','left','commercial',114854,NULL,NULL,5,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=3','','PropalStatusNotSigned','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-29 18:14:52'),(114859,'auguria',1,'','left','commercial',114854,NULL,NULL,6,'/comm/propal/list.php?leftmenu=propals&amp;viewstatut=4','','PropalStatusBilled','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled && $leftmenu==\"propals\"',2,'2015-10-29 18:14:52'),(114862,'auguria',1,'','left','commercial',114852,NULL,NULL,4,'/comm/propal/stats/index.php?leftmenu=propals','','Statistics','propal',1,'','$user->rights->propale->lire','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(114952,'auguria',1,'','left','commercial',113757,NULL,NULL,5,'/commande/index.php?leftmenu=orders','','CustomersOrders','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-29 18:14:52'),(114953,'auguria',1,'','left','commercial',114952,NULL,NULL,0,'/commande/card.php?action=create&amp;leftmenu=orders','','NewOrder','orders',1,'','$user->rights->commande->creer','$conf->commande->enabled',2,'2015-10-29 18:14:52'),(114954,'auguria',1,'','left','commercial',114952,NULL,NULL,1,'/commande/list.php?leftmenu=orders','','List','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-29 18:14:52'),(114955,'auguria',1,'','left','commercial',114954,NULL,NULL,2,'/commande/list.php?leftmenu=orders&amp;viewstatut=0','','StatusOrderDraftShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114956,'auguria',1,'','left','commercial',114954,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=1','','StatusOrderValidated','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114957,'auguria',1,'','left','commercial',114954,NULL,NULL,4,'/commande/list.php?leftmenu=orders&amp;viewstatut=2','','StatusOrderOnProcessShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114958,'auguria',1,'','left','commercial',114954,NULL,NULL,5,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','StatusOrderToBill','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114959,'auguria',1,'','left','commercial',114954,NULL,NULL,6,'/commande/list.php?leftmenu=orders&amp;viewstatut=4','','StatusOrderProcessed','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114960,'auguria',1,'','left','commercial',114954,NULL,NULL,7,'/commande/list.php?leftmenu=orders&amp;viewstatut=-1','','StatusOrderCanceledShort','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled && $leftmenu==\"orders\"',2,'2015-10-29 18:14:52'),(114961,'auguria',1,'','left','commercial',114952,NULL,NULL,4,'/commande/stats/index.php?leftmenu=orders','','Statistics','orders',1,'','$user->rights->commande->lire','$conf->commande->enabled',2,'2015-10-29 18:14:52'),(115052,'auguria',1,'','left','commercial',113755,NULL,NULL,6,'/expedition/index.php?leftmenu=sendings','','Shipments','sendings',0,'sendings','$user->rights->expedition->lire','$conf->expedition->enabled',2,'2015-10-29 18:14:52'),(115053,'auguria',1,'','left','commercial',115052,NULL,NULL,0,'/expedition/card.php?action=create2&leftmenu=sendings','','NewSending','sendings',1,'','$user->rights->expedition->creer','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-29 18:14:52'),(115054,'auguria',1,'','left','commercial',115052,NULL,NULL,1,'/expedition/list.php?leftmenu=sendings','','List','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-29 18:14:52'),(115055,'auguria',1,'','left','commercial',115052,NULL,NULL,2,'/expedition/stats/index.php?leftmenu=sendings','','Statistics','sendings',1,'','$user->rights->expedition->lire','$conf->expedition->enabled && $leftmenu==\"sendings\"',2,'2015-10-29 18:14:52'),(115152,'auguria',1,'','left','commercial',113757,NULL,NULL,7,'/contrat/index.php?leftmenu=contracts','','Contracts','contracts',0,'contracts','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-29 18:14:52'),(115153,'auguria',1,'','left','commercial',115152,NULL,NULL,0,'/contrat/card.php?&action=create&amp;leftmenu=contracts','','NewContract','contracts',1,'','$user->rights->contrat->creer','$conf->contrat->enabled',2,'2015-10-29 18:14:52'),(115154,'auguria',1,'','left','commercial',115152,NULL,NULL,1,'/contrat/list.php?leftmenu=contracts','','List','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-29 18:14:52'),(115155,'auguria',1,'','left','commercial',115152,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts','','MenuServices','contracts',1,'','$user->rights->contrat->lire','$conf->contrat->enabled',2,'2015-10-29 18:14:52'),(115156,'auguria',1,'','left','commercial',115155,NULL,NULL,0,'/contrat/services.php?leftmenu=contracts&amp;mode=0','','MenuInactiveServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-29 18:14:52'),(115157,'auguria',1,'','left','commercial',115155,NULL,NULL,1,'/contrat/services.php?leftmenu=contracts&amp;mode=4','','MenuRunningServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-29 18:14:52'),(115158,'auguria',1,'','left','commercial',115155,NULL,NULL,2,'/contrat/services.php?leftmenu=contracts&amp;mode=4&amp;filter=expired','','MenuExpiredServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-29 18:14:52'),(115159,'auguria',1,'','left','commercial',115155,NULL,NULL,3,'/contrat/services.php?leftmenu=contracts&amp;mode=5','','MenuClosedServices','contracts',2,'','$user->rights->contrat->lire','$conf->contrat->enabled&&$leftmenu==\"contracts\"',2,'2015-10-29 18:14:52'),(115252,'auguria',1,'','left','commercial',113757,NULL,NULL,8,'/fichinter/list.php?leftmenu=ficheinter','','Interventions','interventions',0,'ficheinter','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2015-10-29 18:14:52'),(115253,'auguria',1,'','left','commercial',115252,NULL,NULL,0,'/fichinter/card.php?action=create&amp;leftmenu=ficheinter','','NewIntervention','interventions',1,'','$user->rights->ficheinter->creer','$conf->ficheinter->enabled',2,'2015-10-29 18:14:52'),(115254,'auguria',1,'','left','commercial',115252,NULL,NULL,1,'/fichinter/list.php?leftmenu=ficheinter','','List','interventions',1,'','$user->rights->ficheinter->lire','$conf->ficheinter->enabled',2,'2015-10-29 18:14:52'),(115352,'auguria',1,'','left','accountancy',113758,NULL,NULL,3,'/fourn/facture/list.php?leftmenu=suppliers_bills','','BillsSuppliers','bills',0,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(115353,'auguria',1,'','left','accountancy',115352,NULL,NULL,0,'/fourn/facture/card.php?action=create&amp;leftmenu=suppliers_bills','','NewBill','bills',1,'','$user->rights->fournisseur->facture->creer','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(115354,'auguria',1,'','left','accountancy',115352,NULL,NULL,1,'/fourn/facture/impayees.php?leftmenu=suppliers_bills','','Unpaid','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(115355,'auguria',1,'','left','accountancy',115352,NULL,NULL,2,'/fourn/facture/paiement.php?leftmenu=suppliers_bills','','Payments','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(115356,'auguria',1,'','left','accountancy',115352,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills&mode=supplier','','Statistics','bills',1,'','$user->rights->fournisseur->facture->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(115452,'auguria',1,'','left','accountancy',113758,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills','','BillsCustomers','bills',0,'customer_bills','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115453,'auguria',1,'','left','accountancy',115452,NULL,NULL,3,'/compta/facture.php?action=create&amp;leftmenu=customers_bills','','NewBill','bills',1,'','$user->rights->facture->creer','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115454,'auguria',1,'','left','accountancy',115452,NULL,NULL,5,'/compta/facture/fiche-rec.php?leftmenu=customers_bills','','ListOfTemplates','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115455,'auguria',1,'','left','accountancy',115452,NULL,NULL,7,'/compta/facture/mergepdftool.php?action=facturer&amp;leftmenu=customers_bills','','MergingPDFTool','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115456,'auguria',1,'','left','accountancy',115452,NULL,NULL,6,'/compta/paiement/list.php?leftmenu=customers_bills','','Payments','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115457,'auguria',1,'','left','accountancy',115452,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills','','List','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115462,'auguria',1,'','left','accountancy',115456,NULL,NULL,1,'/compta/paiement/rapport.php?leftmenu=customers_bills','','Reportings','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115463,'auguria',1,'','left','accountancy',113766,NULL,NULL,9,'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank','','MenuChequeDeposits','bills',0,'checks','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-29 18:14:52'),(115464,'auguria',1,'','left','accountancy',115463,NULL,NULL,0,'/compta/paiement/cheque/card.php?leftmenu=checks&amp;action=new','','NewCheckDeposit','compta',1,'','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-29 18:14:52'),(115465,'auguria',1,'','left','accountancy',115463,NULL,NULL,1,'/compta/paiement/cheque/list.php?leftmenu=checks','','List','bills',1,'','$user->rights->banque->lire','! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)',2,'2015-10-29 18:14:52'),(115466,'auguria',1,'','left','accountancy',115452,NULL,NULL,8,'/compta/facture/stats/index.php?leftmenu=customers_bills','','Statistics','bills',1,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115472,'auguria',1,'','left','accountancy',115457,NULL,NULL,1,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=0','','BillShortStatusDraft','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115473,'auguria',1,'','left','accountancy',115457,NULL,NULL,2,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=1','','BillShortStatusNotPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115474,'auguria',1,'','left','accountancy',115457,NULL,NULL,3,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=2','','BillShortStatusPaid','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115475,'auguria',1,'','left','accountancy',115457,NULL,NULL,4,'/compta/facture/list.php?leftmenu=customers_bills&amp;search_status=3','','BillShortStatusCanceled','bills',2,'','$user->rights->facture->lire','$conf->facture->enabled',2,'2015-10-29 18:14:52'),(115652,'auguria',1,'','left','accountancy',113758,NULL,NULL,3,'/commande/list.php?leftmenu=orders&amp;viewstatut=3','','MenuOrdersToBill','orders',0,'orders','$user->rights->commande->lire','$conf->commande->enabled',0,'2015-10-29 18:14:52'),(115752,'auguria',1,'','left','accountancy',113758,NULL,NULL,4,'/don/index.php?leftmenu=donations&amp;mainmenu=accountancy','','Donations','donations',0,'donations','$user->rights->don->lire','$conf->don->enabled',2,'2015-10-29 18:14:52'),(115753,'auguria',1,'','left','accountancy',115752,NULL,NULL,0,'/don/card.php?leftmenu=donations&amp;mainmenu=accountancy&amp;action=create','','NewDonation','donations',1,'','$user->rights->don->creer','$conf->don->enabled && $leftmenu==\"donations\"',2,'2015-10-29 18:14:52'),(115754,'auguria',1,'','left','accountancy',115752,NULL,NULL,1,'/don/list.php?leftmenu=donations&amp;mainmenu=accountancy','','List','donations',1,'','$user->rights->don->lire','$conf->don->enabled && $leftmenu==\"donations\"',2,'2015-10-29 18:14:52'),(115852,'auguria',1,'','left','accountancy',113767,NULL,NULL,5,'/compta/deplacement/index.php?leftmenu=tripsandexpenses','','TripsAndExpenses','trips',0,'tripsandexpenses','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-29 18:14:52'),(115853,'auguria',1,'','left','accountancy',115852,NULL,NULL,1,'/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses','','New','trips',1,'','$user->rights->deplacement->creer','$conf->deplacement->enabled',0,'2015-10-29 18:14:52'),(115854,'auguria',1,'','left','accountancy',115852,NULL,NULL,2,'/compta/deplacement/list.php?leftmenu=tripsandexpenses','','List','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-29 18:14:52'),(115855,'auguria',1,'','left','accountancy',115852,NULL,NULL,2,'/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses','','Statistics','trips',1,'','$user->rights->deplacement->lire','$conf->deplacement->enabled',0,'2015-10-29 18:14:52'),(115952,'auguria',1,'','left','accountancy',113758,NULL,NULL,6,'/compta/charges/index.php?leftmenu=tax&amp;mainmenu=accountancy','','MenuSpecialExpenses','compta',0,'tax','(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)','$conf->tax->enabled || $conf->salaries->enabled',0,'2015-10-29 18:14:52'),(115962,'auguria',1,'','left','accountancy',115952,NULL,NULL,1,'/compta/salaries/index.php?leftmenu=tax_salary&amp;mainmenu=accountancy','','Salaries','salaries',1,'tax_sal','$user->rights->salaries->read','$conf->salaries->enabled',0,'2015-10-29 18:14:52'),(115963,'auguria',1,'','left','accountancy',115962,NULL,NULL,2,'/compta/salaries/card.php?leftmenu=tax_salary&amp;action=create','','NewPayment','companies',2,'','$user->rights->salaries->write','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2015-10-29 18:14:52'),(115964,'auguria',1,'','left','accountancy',115962,NULL,NULL,3,'/compta/salaries/index.php?leftmenu=tax_salary','','Payments','companies',2,'','$user->rights->salaries->read','$conf->salaries->enabled && $leftmenu==\"tax_salary\"',0,'2015-10-29 18:14:52'),(115972,'auguria',1,'','left','accountancy',115952,NULL,NULL,1,'/loan/index.php?leftmenu=tax_loan&amp;mainmenu=accountancy','','Loans','loan',1,'tax_loan','$user->rights->loan->read','$conf->loan->enabled',0,'2015-10-29 18:14:52'),(115973,'auguria',1,'','left','accountancy',115972,NULL,NULL,2,'/loan/card.php?leftmenu=tax_loan&amp;action=create','','NewLoan','loan',2,'','$user->rights->loan->write','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-29 18:14:52'),(115974,'auguria',1,'','left','accountancy',115972,NULL,NULL,3,'/loan/index.php?leftmenu=tax_loan','','Payments','companies',2,'','$user->rights->loan->read','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-29 18:14:52'),(115975,'auguria',1,'','left','accountancy',115972,NULL,NULL,4,'/loan/calc.php?leftmenu=tax_loan','','Calculator','companies',2,'','$user->rights->loan->calc','$conf->loan->enabled && $leftmenu==\"tax_loan\"',0,'2015-10-29 18:14:52'),(116002,'auguria',1,'','left','accountancy',115952,NULL,NULL,1,'/compta/sociales/index.php?leftmenu=tax_social','','SocialContributions','',1,'tax_social','$user->rights->tax->charges->lire','$conf->tax->enabled',0,'2015-10-29 18:14:52'),(116003,'auguria',1,'','left','accountancy',116002,NULL,NULL,2,'/compta/sociales/charges.php?leftmenu=tax_social&amp;action=create','','MenuNewSocialContribution','',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2015-10-29 18:14:52'),(116004,'auguria',1,'','left','accountancy',116002,NULL,NULL,3,'/compta/charges/index.php?leftmenu=tax_social&amp;mainmenu=accountancy&amp;mode=sconly','','Payments','',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && $leftmenu==\"tax_social\"',0,'2015-10-29 18:14:52'),(116052,'auguria',1,'','left','accountancy',115952,NULL,NULL,7,'/compta/tva/index.php?leftmenu=tax_vat&amp;mainmenu=accountancy','','VAT','companies',1,'tax_vat','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)',0,'2015-10-29 18:14:52'),(116053,'auguria',1,'','left','accountancy',116052,NULL,NULL,0,'/compta/tva/card.php?leftmenu=tax_vat&amp;action=create','','NewPayment','companies',2,'','$user->rights->tax->charges->creer','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-29 18:14:52'),(116054,'auguria',1,'','left','accountancy',116052,NULL,NULL,1,'/compta/tva/reglement.php?leftmenu=tax_vat','','Payments','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-29 18:14:52'),(116055,'auguria',1,'','left','accountancy',116052,NULL,NULL,2,'/compta/tva/clients.php?leftmenu=tax_vat','','ReportByCustomers','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-29 18:14:52'),(116056,'auguria',1,'','left','accountancy',116052,NULL,NULL,3,'/compta/tva/quadri_detail.php?leftmenu=tax_vat','','ReportByQuarter','companies',2,'','$user->rights->tax->charges->lire','$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu==\"tax_vat\"',0,'2015-10-29 18:14:52'),(116152,'auguria',1,'','left','accountancy',113758,NULL,NULL,8,'/accountancy/customer/index.php?leftmenu=ventil_customer','','CustomersVentilation','accountancy',0,'ventil_customer','$user->rights->accounting->ventilation->read','$conf->accounting->enabled',0,'2015-10-29 18:14:52'),(116153,'auguria',1,'','left','accountancy',116152,NULL,NULL,0,'/accountancy/customer/list.php','','ToDispatch','accountancy',1,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $leftmenu==\"ventil_customer\"',0,'2015-10-29 18:14:52'),(116154,'auguria',1,'','left','accountancy',116152,NULL,NULL,1,'/accountancy/customer/lines.php','','Dispatched','accountancy',1,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $leftmenu==\"ventil_customer\"',0,'2015-10-29 18:14:52'),(116162,'auguria',1,'','left','accountancy',113758,NULL,NULL,9,'/accountancy/supplier/index.php?leftmenu=ventil_supplier','','SuppliersVentilation','accountancy',0,'ventil_supplier','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled',0,'2015-10-29 18:14:52'),(116163,'auguria',1,'','left','accountancy',116162,NULL,NULL,0,'/accountancy/supplier/list.php','','ToDispatch','accountancy',1,'','$user->rights->accounting->ventilation->dispatch','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"ventil_supplier\"',0,'2015-10-29 18:14:52'),(116164,'auguria',1,'','left','accountancy',116162,NULL,NULL,1,'/accountancy/supplier/lines.php','','Dispatched','accountancy',1,'','$user->rights->accounting->ventilation->read','$conf->accounting->enabled && $conf->fournisseur->enabled && $leftmenu==\"ventil_supplier\"',0,'2015-10-29 18:14:52'),(116252,'auguria',1,'','left','accountancy',113766,NULL,NULL,9,'/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank','','StandingOrders','withdrawals',0,'withdraw','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled',2,'2015-10-29 18:14:52'),(116254,'auguria',1,'','left','accountancy',116252,NULL,NULL,0,'/compta/prelevement/create.php?leftmenu=withdraw','','NewStandingOrder','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-29 18:14:52'),(116255,'auguria',1,'','left','accountancy',116252,NULL,NULL,2,'/compta/prelevement/bons.php?leftmenu=withdraw','','WithdrawalsReceipts','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-29 18:14:52'),(116256,'auguria',1,'','left','accountancy',116252,NULL,NULL,3,'/compta/prelevement/list.php?leftmenu=withdraw','','WithdrawalsLines','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-29 18:14:52'),(116258,'auguria',1,'','left','accountancy',116252,NULL,NULL,5,'/compta/prelevement/rejets.php?leftmenu=withdraw','','Rejects','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-29 18:14:52'),(116259,'auguria',1,'','left','accountancy',116252,NULL,NULL,6,'/compta/prelevement/stats.php?leftmenu=withdraw','','Statistics','withdrawals',1,'','$user->rights->prelevement->bons->lire','$conf->prelevement->enabled && $leftmenu==\"withdraw\"',2,'2015-10-29 18:14:52'),(116352,'auguria',1,'','left','accountancy',113766,NULL,NULL,1,'/compta/bank/index.php?leftmenu=bank&amp;mainmenu=bank','','MenuBankCash','banks',0,'bank','$user->rights->banque->lire','$conf->banque->enabled',0,'2015-10-29 18:14:52'),(116353,'auguria',1,'','left','accountancy',116352,NULL,NULL,0,'/compta/bank/card.php?action=create&amp;leftmenu=bank','','MenuNewFinancialAccount','banks',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-29 18:14:52'),(116354,'auguria',1,'','left','accountancy',116352,NULL,NULL,1,'/compta/bank/categ.php?leftmenu=bank','','Rubriques','categories',1,'','$user->rights->banque->configurer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-29 18:14:52'),(116355,'auguria',1,'','left','accountancy',116352,NULL,NULL,2,'/compta/bank/search.php?leftmenu=bank','','ListTransactions','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-29 18:14:52'),(116356,'auguria',1,'','left','accountancy',116352,NULL,NULL,3,'/compta/bank/budget.php?leftmenu=bank','','ListTransactionsByCategory','banks',1,'','$user->rights->banque->lire','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-29 18:14:52'),(116358,'auguria',1,'','left','accountancy',116352,NULL,NULL,5,'/compta/bank/virement.php?leftmenu=bank','','BankTransfers','banks',1,'','$user->rights->banque->transfer','$conf->banque->enabled && ($leftmenu==\"bank\" || $leftmenu==\"checks\" || $leftmenu==\"withdraw\")',0,'2015-10-29 18:14:52'),(116452,'auguria',1,'','left','accountancy',113758,NULL,NULL,11,'/compta/resultat/index.php?leftmenu=ca&amp;mainmenu=accountancy','','Reportings','main',0,'ca','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled',0,'2015-10-29 18:14:52'),(116453,'auguria',1,'','left','accountancy',116452,NULL,NULL,0,'/compta/resultat/index.php?leftmenu=ca','','ReportInOut','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116454,'auguria',1,'','left','accountancy',116453,NULL,NULL,0,'/compta/resultat/clientfourn.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116455,'auguria',1,'','left','accountancy',116452,NULL,NULL,1,'/compta/stats/index.php?leftmenu=ca','','ReportTurnover','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116456,'auguria',1,'','left','accountancy',116455,NULL,NULL,0,'/compta/stats/casoc.php?leftmenu=ca','','ByCompanies','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116457,'auguria',1,'','left','accountancy',116455,NULL,NULL,1,'/compta/stats/cabyuser.php?leftmenu=ca','','ByUsers','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116458,'auguria',1,'','left','accountancy',116452,NULL,NULL,1,'/compta/journal/sellsjournal.php?leftmenu=ca','','SellsJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116459,'auguria',1,'','left','accountancy',116452,NULL,NULL,1,'/compta/journal/purchasesjournal.php?leftmenu=ca','','PurchasesJournal','main',1,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116460,'auguria',1,'','left','accountancy',116455,NULL,NULL,1,'/compta/stats/cabyprodserv.php?leftmenu=ca','','ByProductsAndServices','main',2,'','$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire','$conf->comptabilite->enabled || $conf->accounting->enabled && $leftmenu==\"ca\"',0,'2015-10-29 18:14:52'),(116472,'auguria',1,'','left','accountancy',113758,NULL,NULL,12,'/accountancy/bookkeeping/list.php?leftmenu=bookkeeping','','Bookkeeping','accountancy',0,'bookkeeping','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled',0,'2015-10-29 18:14:52'),(116473,'auguria',1,'','left','accountancy',116472,NULL,NULL,0,'/accountancy/bookkeeping/listbyyear.php','','ByYear','accountancy',1,'','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled && $leftmenu==\"bookkeeping\"',0,'2015-10-29 18:14:52'),(116474,'auguria',1,'','left','accountancy',116472,NULL,NULL,1,'/accountancy/bookkeeping/balancebymonth.php','','AccountBalanceByMonth','accountancy',1,'','$user->rights->accounting->mouvements->lire','$conf->accounting->enabled && $leftmenu==\"bookkeeping\"',0,'2015-10-29 18:14:52'),(116502,'auguria',1,'','left','home',113758,NULL,NULL,20,'/accountancy/admin/fiscalyear.php?leftmenu=setup','','Fiscalyear','accountancy',1,'','$user->rights->accounting->fiscalyear','$conf->accounting->enabled',2,'2015-10-29 18:14:52'),(116503,'auguria',1,'','left','home',113758,NULL,NULL,21,'/accountancy/admin/account.php?mainmenu=accountancy','','Chartofaccounts','accountancy',1,'','$user->rights->accounting->chartofaccount','$conf->accounting->enabled',2,'2015-10-29 18:14:52'),(116552,'auguria',1,'','left','products',113755,NULL,NULL,0,'/product/index.php?leftmenu=product&amp;type=0','','Products','products',0,'product','$user->rights->produit->lire','$conf->product->enabled',2,'2015-10-29 18:14:52'),(116553,'auguria',1,'','left','products',116552,NULL,NULL,0,'/product/card.php?leftmenu=product&amp;action=create&amp;type=0','','NewProduct','products',1,'','$user->rights->produit->creer','$conf->product->enabled',2,'2015-10-29 18:14:52'),(116554,'auguria',1,'','left','products',116552,NULL,NULL,1,'/product/list.php?leftmenu=product&amp;type=0','','List','products',1,'','$user->rights->produit->lire','$conf->product->enabled',2,'2015-10-29 18:14:52'),(116555,'auguria',1,'','left','products',116552,NULL,NULL,4,'/product/reassort.php?type=0','','Stocks','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->product->enabled',2,'2015-10-29 18:14:52'),(116556,'auguria',1,'','left','products',116552,NULL,NULL,6,'/product/popuprop.php?leftmenu=stats&amp;type=0','','Statistics','main',1,'','$user->rights->produit->lire','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(116557,'auguria',1,'','left','products',116552,NULL,NULL,5,'/product/reassortlot.php?type=0','','StocksByLotSerial','products',1,'','$user->rights->produit->lire && $user->rights->stock->lire','$conf->productbatch->enabled',2,'2015-10-29 18:14:52'),(116652,'auguria',1,'','left','products',113755,NULL,NULL,1,'/product/index.php?leftmenu=service&amp;type=1','','Services','products',0,'service','$user->rights->service->lire','$conf->service->enabled',2,'2015-10-29 18:14:52'),(116653,'auguria',1,'','left','products',116652,NULL,NULL,0,'/product/card.php?leftmenu=service&amp;action=create&amp;type=1','','NewService','products',1,'','$user->rights->service->creer','$conf->service->enabled',2,'2015-10-29 18:14:52'),(116654,'auguria',1,'','left','products',116652,NULL,NULL,1,'/product/list.php?leftmenu=service&amp;type=1','','List','products',1,'','$user->rights->service->lire','$conf->service->enabled',2,'2015-10-29 18:14:52'),(116655,'auguria',1,'','left','products',116652,NULL,NULL,5,'/product/popuprop.php?leftmenu=stats&amp;type=1','','Statistics','main',1,'','$user->rights->service->lire','$conf->propal->enabled',2,'2015-10-29 18:14:52'),(116852,'auguria',1,'','left','products',113755,NULL,NULL,3,'/product/stock/index.php?leftmenu=stock','','Stock','stocks',0,'stock','$user->rights->stock->lire','$conf->stock->enabled',2,'2015-10-29 18:14:52'),(116853,'auguria',1,'','left','products',116852,NULL,NULL,0,'/product/stock/card.php?action=create','','MenuNewWarehouse','stocks',1,'','$user->rights->stock->creer','$conf->stock->enabled',2,'2015-10-29 18:14:52'),(116854,'auguria',1,'','left','products',116852,NULL,NULL,1,'/product/stock/list.php','','List','stocks',1,'','$user->rights->stock->lire','$conf->stock->enabled',2,'2015-10-29 18:14:52'),(116856,'auguria',1,'','left','products',116852,NULL,NULL,3,'/product/stock/mouvement.php','','Movements','stocks',1,'','$user->rights->stock->mouvement->lire','$conf->stock->enabled',2,'2015-10-29 18:14:52'),(116857,'auguria',1,'','left','products',116852,NULL,NULL,4,'/product/stock/replenish.php','','Replenishments','stocks',1,'','$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire','$conf->stock->enabled && $conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(116858,'auguria',1,'','left','products',116852,NULL,NULL,5,'/product/stock/massstockmove.php','','StockTransfer','stocks',1,'','$user->rights->stock->mouvement->creer','$conf->stock->enabled',2,'2015-10-29 18:14:52'),(116952,'auguria',1,'','left','products',113755,NULL,NULL,4,'/categories/index.php?leftmenu=cat&amp;type=0','','Categories','categories',0,'cat','$user->rights->categorie->lire','$conf->categorie->enabled',2,'2015-10-29 18:14:52'),(116953,'auguria',1,'','left','products',116952,NULL,NULL,0,'/categories/card.php?action=create&amp;type=0','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->categorie->enabled',2,'2015-10-29 18:14:52'),(117352,'auguria',1,'','left','project',113759,NULL,NULL,0,'/projet/index.php?leftmenu=projects','','Projects','projects',0,'projects','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117353,'auguria',1,'','left','project',117352,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117354,'auguria',1,'','left','project',117352,NULL,NULL,2,'/projet/list.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117362,'auguria',1,'','left','project',113759,NULL,NULL,0,'/projet/index.php?leftmenu=projects&amp;mode=mine','','MyProjects','projects',0,'myprojects','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117363,'auguria',1,'','left','project',117362,NULL,NULL,1,'/projet/card.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewProject','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117364,'auguria',1,'','left','project',117362,NULL,NULL,2,'/projet/list.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117452,'auguria',1,'','left','project',113759,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects','','Activities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117453,'auguria',1,'','left','project',117452,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117454,'auguria',1,'','left','project',117452,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117455,'auguria',1,'','left','project',117452,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117552,'auguria',1,'','left','project',113759,NULL,NULL,0,'/projet/activity/index.php?leftmenu=projects&amp;mode=mine','','MyActivities','projects',0,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117553,'auguria',1,'','left','project',117552,NULL,NULL,1,'/projet/tasks.php?leftmenu=projects&amp;action=create&amp;mode=mine','','NewTask','projects',1,'','$user->rights->projet->creer','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117554,'auguria',1,'','left','project',117552,NULL,NULL,2,'/projet/tasks/index.php?leftmenu=projects&amp;mode=mine','','List','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117555,'auguria',1,'','left','project',117552,NULL,NULL,3,'/projet/activity/perweek.php?leftmenu=projects&amp;mode=mine','','NewTimeSpent','projects',1,'','$user->rights->projet->lire','$conf->projet->enabled',2,'2015-10-29 18:14:52'),(117652,'auguria',1,'','left','tools',113760,NULL,NULL,0,'/comm/mailing/index.php?leftmenu=mailing','','EMailings','mails',0,'mailing','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2015-10-29 18:14:52'),(117653,'auguria',1,'','left','tools',117652,NULL,NULL,0,'/comm/mailing/card.php?leftmenu=mailing&amp;action=create','','NewMailing','mails',1,'','$user->rights->mailing->creer','$conf->mailing->enabled',0,'2015-10-29 18:14:52'),(117654,'auguria',1,'','left','tools',117652,NULL,NULL,1,'/comm/mailing/list.php?leftmenu=mailing','','List','mails',1,'','$user->rights->mailing->lire','$conf->mailing->enabled',0,'2015-10-29 18:14:52'),(117852,'auguria',1,'','left','tools',113760,NULL,NULL,2,'/exports/index.php?leftmenu=export','','FormatedExport','exports',0,'export','$user->rights->export->lire','$conf->export->enabled',2,'2015-10-29 18:14:52'),(117853,'auguria',1,'','left','tools',117852,NULL,NULL,0,'/exports/export.php?leftmenu=export','','NewExport','exports',1,'','$user->rights->export->creer','$conf->export->enabled',2,'2015-10-29 18:14:52'),(117882,'auguria',1,'','left','tools',113760,NULL,NULL,2,'/imports/index.php?leftmenu=import','','FormatedImport','exports',0,'import','$user->rights->import->run','$conf->import->enabled',2,'2015-10-29 18:14:52'),(117883,'auguria',1,'','left','tools',117882,NULL,NULL,0,'/imports/import.php?leftmenu=import','','NewImport','exports',1,'','$user->rights->import->run','$conf->import->enabled',2,'2015-10-29 18:14:52'),(117952,'auguria',1,'','left','members',113765,NULL,NULL,0,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Members','members',0,'members','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117953,'auguria',1,'','left','members',117952,NULL,NULL,0,'/adherents/card.php?leftmenu=members&amp;action=create','','NewMember','members',1,'','$user->rights->adherent->creer','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117954,'auguria',1,'','left','members',117952,NULL,NULL,1,'/adherents/list.php','','List','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117955,'auguria',1,'','left','members',117954,NULL,NULL,2,'/adherents/list.php?leftmenu=members&amp;statut=-1','','MenuMembersToValidate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117956,'auguria',1,'','left','members',117954,NULL,NULL,3,'/adherents/list.php?leftmenu=members&amp;statut=1','','MenuMembersValidated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117957,'auguria',1,'','left','members',117954,NULL,NULL,4,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate','','MenuMembersNotUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117958,'auguria',1,'','left','members',117954,NULL,NULL,5,'/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate','','MenuMembersUpToDate','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117959,'auguria',1,'','left','members',117954,NULL,NULL,6,'/adherents/list.php?leftmenu=members&amp;statut=0','','MenuMembersResiliated','members',2,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(117960,'auguria',1,'','left','members',117952,NULL,NULL,7,'/adherents/stats/geo.php?leftmenu=members&amp;mode=memberbycountry','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118052,'auguria',1,'','left','members',113765,NULL,NULL,1,'/adherents/index.php?leftmenu=members&amp;mainmenu=members','','Subscriptions','compta',0,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118053,'auguria',1,'','left','members',118052,NULL,NULL,0,'/adherents/list.php?statut=-1&amp;leftmenu=accountancy&amp;mainmenu=members','','NewSubscription','compta',1,'','$user->rights->adherent->cotisation->creer','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118054,'auguria',1,'','left','members',118052,NULL,NULL,1,'/adherents/cotisations.php?leftmenu=members','','List','compta',1,'','$user->rights->adherent->cotisation->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118055,'auguria',1,'','left','members',118052,NULL,NULL,7,'/adherents/stats/index.php?leftmenu=members','','MenuMembersStats','members',1,'','$user->rights->adherent->lire','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118252,'auguria',1,'','left','members',113765,NULL,NULL,3,'/adherents/index.php?leftmenu=export&amp;mainmenu=members','','Exports','members',0,'export','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118253,'auguria',1,'','left','members',118252,NULL,NULL,0,'/exports/index.php?leftmenu=export','','Datas','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled && $conf->export->enabled',2,'2015-10-29 18:14:52'),(118254,'auguria',1,'','left','members',118252,NULL,NULL,1,'/adherents/htpasswd.php?leftmenu=export','','Filehtpasswd','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118255,'auguria',1,'','left','members',118252,NULL,NULL,2,'/adherents/cartes/carte.php?leftmenu=export','','MembersCards','members',1,'','$user->rights->adherent->export','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118452,'auguria',1,'','left','members',113765,NULL,NULL,5,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','MembersTypes','members',0,'setup','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118453,'auguria',1,'','left','members',118452,NULL,NULL,0,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create','','New','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118454,'auguria',1,'','left','members',118452,NULL,NULL,1,'/adherents/type.php?leftmenu=setup&amp;mainmenu=members','','List','members',1,'','$user->rights->adherent->configurer','$conf->adherent->enabled',2,'2015-10-29 18:14:52'),(118752,'auguria',1,'','left','hrm',113767,NULL,NULL,1,'/holiday/list.php?&leftmenu=hrm','','CPTitreMenu','holiday',0,'hrm','$user->rights->holiday->write','$conf->holiday->enabled',0,'2015-10-29 18:14:52'),(118753,'auguria',1,'','left','hrm',118752,NULL,NULL,1,'/holiday/card.php?&action=request','','MenuAddCP','holiday',1,'','$user->rights->holiday->write','$conf->holiday->enabled',0,'2015-10-29 18:14:52'),(118754,'auguria',1,'','left','hrm',118752,NULL,NULL,2,'/holiday/define_holiday.php?&action=request','','MenuConfCP','holiday',1,'','$user->rights->holiday->define_holiday','$conf->holiday->enabled',0,'2015-10-29 18:14:52'),(118755,'auguria',1,'','left','hrm',118752,NULL,NULL,3,'/holiday/view_log.php?&action=request','','MenuLogCP','holiday',1,'','$user->rights->holiday->view_log','$conf->holiday->enabled',0,'2015-10-29 18:14:52'),(118756,'auguria',1,'','left','hrm',118752,NULL,NULL,4,'/holiday/month_report.php?&action=request','','MenuReportMonth','holiday',1,'','$user->rights->holiday->month_report','$conf->holiday->enabled',0,'2015-10-29 18:14:52'),(118852,'auguria',1,'','left','commercial',113757,NULL,NULL,6,'/fourn/commande/index.php?leftmenu=orders_suppliers','','SuppliersOrders','orders',0,'orders_suppliers','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(118853,'auguria',1,'','left','commercial',118852,NULL,NULL,0,'/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers','','NewOrder','orders',1,'','$user->rights->fournisseur->commande->creer','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(118854,'auguria',1,'','left','commercial',118852,NULL,NULL,1,'/fourn/commande/list.php?leftmenu=orders_suppliers&amp;viewstatut=0','','List','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(118860,'auguria',1,'','left','commercial',118852,NULL,NULL,7,'/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier','','Statistics','orders',1,'','$user->rights->fournisseur->commande->lire','$conf->fournisseur->enabled',2,'2015-10-29 18:14:52'),(118952,'auguria',1,'','left','members',113765,NULL,NULL,3,'/categories/index.php?leftmenu=cat&amp;type=3','','MembersCategoriesShort','categories',0,'cat','$user->rights->categorie->lire','$conf->adherent->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52'),(118953,'auguria',1,'','left','members',118952,NULL,NULL,0,'/categories/card.php?action=create&amp;type=3','','NewCategory','categories',1,'','$user->rights->categorie->creer','$conf->adherent->enabled && $conf->categorie->enabled',2,'2015-10-29 18:14:52');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7133,7 +7133,7 @@ CREATE TABLE `llx_projet` (
 
 LOCK TABLES `llx_projet` WRITE;
 /*!40000 ALTER TABLE `llx_projet` DISABLE KEYS */;
-INSERT INTO `llx_projet` VALUES (1,NULL,'2010-07-09','2014-12-21 13:17:58','2010-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL),(2,NULL,'2010-07-09','2010-07-08 22:49:56','2010-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,'2010-07-09','2010-07-08 22:50:19','2010-07-09',NULL,'PROJABC',1,'Project to create ABC company','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,NULL,'2010-07-09','2010-07-08 22:50:49','2010-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,NULL,'2010-07-11','2010-07-11 14:22:49','2010-07-11','2011-07-14','RMLL',1,'Projet gestion RMLL 2011','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_projet` VALUES (1,11,'2010-07-09','2015-10-05 20:51:28','2010-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL),(2,13,'2010-07-09','2015-10-05 20:51:51','2010-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,1,'2010-07-09','2010-07-08 22:50:19','2010-07-09',NULL,'PROJABC',1,'Project to create ABC company','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,NULL,'2010-07-09','2010-07-08 22:50:49','2010-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,NULL,'2010-07-11','2010-07-11 14:22:49','2010-07-11','2011-07-14','RMLL',1,'Projet gestion RMLL 2011','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7340,7 +7340,7 @@ CREATE TABLE `llx_propal` (
   CONSTRAINT `fk_propal_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_propal_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_propal_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7454,7 +7454,7 @@ CREATE TABLE `llx_propaldet` (
   KEY `fk_propaldet_fk_unit` (`fk_unit`),
   CONSTRAINT `fk_propaldet_fk_propal` FOREIGN KEY (`fk_propal`) REFERENCES `llx_propal` (`rowid`),
   CONSTRAINT `fk_propaldet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7662,7 +7662,7 @@ CREATE TABLE `llx_rights_def` (
 
 LOCK TABLES `llx_rights_def` WRITE;
 /*!40000 ALTER TABLE `llx_rights_def` DISABLE KEYS */;
-INSERT INTO `llx_rights_def` VALUES (11,'Lire les factures','facture',1,'lire',NULL,'a',1),(11,'Lire les factures','facture',2,'lire',NULL,'a',1),(12,'Creer/modifier les factures','facture',1,'creer',NULL,'a',0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0),(13,'Dévalider les factures','facture',1,'invoice_advance','unvalidate','a',0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0),(14,'Valider les factures','facture',1,'invoice_advance','validate','a',0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0),(15,'Envoyer les factures par mail','facture',1,'invoice_advance','send','a',0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0),(16,'Emettre des paiements sur les factures','facture',1,'paiement',NULL,'a',0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0),(19,'Supprimer les factures','facture',1,'supprimer',NULL,'a',0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0),(24,'Valider les propositions commerciales','propale',1,'valider',NULL,'d',0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0),(26,'Cloturer les propositions commerciales','propale',1,'cloturer',NULL,'d',0),(26,'Cloturer les propositions commerciales','propale',2,'cloturer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1),(31,'Lire les produits','produit',2,'lire',NULL,'r',1),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0),(41,'Lire les projets et taches (partagés ou dont je suis contact)','projet',1,'lire',NULL,'r',1),(42,'Creer/modifier les projets et taches (partagés ou dont je suis contact)','projet',1,'creer',NULL,'w',0),(44,'Supprimer les projets et taches (partagés ou dont je suis contact)','projet',1,'supprimer',NULL,'d',0),(45,'Exporter les projets','projet',1,'export',NULL,'d',0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',1),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',1),(74,'Remove members','adherent',1,'supprimer',NULL,'d',1),(75,'Setup types and attributes of members','adherent',1,'configurer',NULL,'w',1),(76,'Export members','adherent',1,'export',NULL,'r',0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',1),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',1),(81,'Lire les commandes clients','commande',1,'lire',NULL,'r',1),(82,'Creer/modifier les commandes clients','commande',1,'creer',NULL,'w',0),(84,'Valider les commandes clients','commande',1,'order_advance','validate','d',0),(86,'Envoyer les commandes clients','commande',1,'order_advance','send','d',0),(87,'Cloturer les commandes clients','commande',1,'cloturer',NULL,'d',0),(88,'Annuler les commandes clients','commande',1,'order_advance','annuler','d',0),(89,'Supprimer les commandes clients','commande',1,'supprimer',NULL,'d',0),(91,'Lire les charges','tax',1,'charges','lire','r',1),(91,'Lire les charges','tax',2,'charges','lire','r',1),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0),(94,'Exporter les charges','tax',1,'charges','export','r',0),(94,'Exporter les charges','tax',2,'charges','export','r',0),(95,'Lire CA, bilans, resultats','compta',1,'resultat','lire','r',1),(96,'Parametrer la ventilation','compta',1,'ventilation','parametrer','r',0),(97,'Lire les ventilations de factures','compta',1,'ventilation','lire','r',1),(98,'Ventiler les lignes de factures','compta',1,'ventilation','creer','r',0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',1),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0),(104,'Valider les expeditions','expedition',1,'valider',NULL,'d',0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',1),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0),(121,'Lire les societes','societe',1,'lire',NULL,'r',1),(121,'Lire les societes','societe',2,'lire',NULL,'r',1),(122,'Creer modifier les societes','societe',1,'creer',NULL,'w',0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0),(125,'Supprimer les societes','societe',1,'supprimer',NULL,'d',0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0),(126,'Exporter les societes','societe',1,'export',NULL,'r',0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0),(141,'Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','lire','r',0),(142,'Creer/modifier tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','creer','w',0),(144,'Supprimer tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','supprimer','d',0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0),(171,'Lire ses notes de frais et deplacements et celles de sa hierarchy','deplacement',1,'lire',NULL,'r',1),(172,'Creer/modifier une note de frais et deplacements','deplacement',1,'creer',NULL,'w',0),(173,'Supprimer les notes de frais et deplacements','deplacement',1,'supprimer',NULL,'d',0),(174,'Lire toutes les notes de frais','deplacement',1,'readall',NULL,'d',0),(178,'Exporter les notes de frais et deplacements','deplacement',1,'export',NULL,'d',0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0),(229,'Supprimer les mailings)','mailing',1,'supprimer',NULL,'d',1),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',1),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',1),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',1,'client','voir','r',1),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1),(281,'Lire les contacts','societe',1,'contact','lire','r',1),(281,'Lire les contacts','societe',2,'contact','lire','r',1),(282,'Creer modifier les contacts','societe',1,'contact','creer','w',0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0),(283,'Supprimer les contacts','societe',1,'contact','supprimer','d',0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0),(286,'Exporter les contacts','societe',1,'contact','export','d',0),(286,'Exporter les contacts','societe',2,'contact','export','d',0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',1),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',1),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',1),(343,'Modifier son propre mot de passe','user',1,'self','password','w',1),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',1),(351,'Consulter les groupes','user',1,'group_advance','read','r',0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0),(531,'Lire les services','service',1,'lire',NULL,'r',1),(532,'Creer/modifier les services','service',1,'creer',NULL,'w',0),(534,'Supprimer les services','service',1,'supprimer',NULL,'d',0),(538,'Exporter les services','service',1,'export',NULL,'r',0),(700,'Lire les dons','don',1,'lire',NULL,'r',1),(701,'Creer/modifier les dons','don',1,'creer',NULL,'w',0),(701,'Lire les dons','don',2,'lire',NULL,'r',1),(702,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',1),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',1),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',1),(1101,'Lire les bons de livraison','expedition',1,'livraison','lire','r',1),(1102,'Creer modifier les bons de livraison','expedition',1,'livraison','creer','w',0),(1104,'Valider les bons de livraison','expedition',1,'livraison','valider','d',0),(1109,'Supprimer les bons de livraison','expedition',1,'livraison','supprimer','d',0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',1),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',1),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',1),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',1),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0),(1237,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',1,'facture','export','r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0),(1421,'Exporter les commandes clients et attributs','commande',1,'commande','export','r',0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',1),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',1),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',1),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',1),(20001,'Read your own holidays','holiday',1,'read',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Create/modify your own holidays','holiday',1,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Delete holidays','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Read holidays for everybody','holiday',1,'read_all',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Create/modify holidays for everybody','holiday',1,'write_all',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Setup holidays of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',1),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0),(50101,'Use point of sale','cashdesk',1,'use',NULL,'a',1),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0),(400051,'Use POS','pos',2,'frontend',NULL,'a',1),(400052,'Use Backend','pos',2,'backend',NULL,'a',1),(400053,'Make Transfers','pos',2,'transfer',NULL,'a',1),(400055,'Stats','pos',2,'stats',NULL,'a',1);
+INSERT INTO `llx_rights_def` VALUES (11,'Lire les factures','facture',1,'lire',NULL,'a',1),(11,'Lire les factures','facture',2,'lire',NULL,'a',1),(12,'Creer/modifier les factures','facture',1,'creer',NULL,'a',0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0),(13,'Dévalider les factures','facture',1,'invoice_advance','unvalidate','a',0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0),(14,'Valider les factures','facture',1,'invoice_advance','validate','a',0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0),(15,'Envoyer les factures par mail','facture',1,'invoice_advance','send','a',0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0),(16,'Emettre des paiements sur les factures','facture',1,'paiement',NULL,'a',0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0),(19,'Supprimer les factures','facture',1,'supprimer',NULL,'a',0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0),(24,'Valider les propositions commerciales','propale',1,'valider',NULL,'d',0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0),(26,'Cloturer les propositions commerciales','propale',1,'cloturer',NULL,'d',0),(26,'Cloturer les propositions commerciales','propale',2,'cloturer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1),(31,'Lire les produits','produit',2,'lire',NULL,'r',1),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0),(41,'Lire les projets et taches (partagés ou dont je suis contact)','projet',1,'lire',NULL,'r',1),(42,'Creer/modifier les projets et taches (partagés ou dont je suis contact)','projet',1,'creer',NULL,'w',0),(44,'Supprimer les projets et taches (partagés ou dont je suis contact)','projet',1,'supprimer',NULL,'d',0),(45,'Exporter les projets','projet',1,'export',NULL,'d',0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',1),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',1),(74,'Remove members','adherent',1,'supprimer',NULL,'d',1),(75,'Setup types and attributes of members','adherent',1,'configurer',NULL,'w',1),(76,'Export members','adherent',1,'export',NULL,'r',0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',1),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',1),(81,'Lire les commandes clients','commande',1,'lire',NULL,'r',1),(82,'Creer/modifier les commandes clients','commande',1,'creer',NULL,'w',0),(84,'Valider les commandes clients','commande',1,'order_advance','validate','d',0),(86,'Envoyer les commandes clients','commande',1,'order_advance','send','d',0),(87,'Cloturer les commandes clients','commande',1,'cloturer',NULL,'d',0),(88,'Annuler les commandes clients','commande',1,'order_advance','annuler','d',0),(89,'Supprimer les commandes clients','commande',1,'supprimer',NULL,'d',0),(91,'Lire les charges','tax',1,'charges','lire','r',1),(91,'Lire les charges','tax',2,'charges','lire','r',1),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0),(94,'Exporter les charges','tax',1,'charges','export','r',0),(94,'Exporter les charges','tax',2,'charges','export','r',0),(95,'Lire CA, bilans, resultats','compta',1,'resultat','lire','r',1),(96,'Parametrer la ventilation','compta',1,'ventilation','parametrer','r',0),(97,'Lire les ventilations de factures','compta',1,'ventilation','lire','r',1),(98,'Ventiler les lignes de factures','compta',1,'ventilation','creer','r',0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',1),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0),(104,'Valider les expeditions','expedition',1,'valider',NULL,'d',0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0),(111,'Lire les comptes bancaires','banque',1,'lire',NULL,'r',1),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0),(121,'Lire les societes','societe',1,'lire',NULL,'r',1),(121,'Lire les societes','societe',2,'lire',NULL,'r',1),(122,'Creer modifier les societes','societe',1,'creer',NULL,'w',0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0),(125,'Supprimer les societes','societe',1,'supprimer',NULL,'d',0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0),(126,'Exporter les societes','societe',1,'export',NULL,'r',0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0),(141,'Lire tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','lire','r',0),(142,'Creer/modifier tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','creer','w',0),(144,'Supprimer tous les projets et taches (y compris prives qui ne me sont pas affectes)','projet',1,'all','supprimer','d',0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0),(167,'Export contracts','contrat',1,'export',NULL,'r',0),(171,'Lire ses notes de frais et deplacements et celles de sa hierarchy','deplacement',1,'lire',NULL,'r',1),(172,'Creer/modifier une note de frais et deplacements','deplacement',1,'creer',NULL,'w',0),(173,'Supprimer les notes de frais et deplacements','deplacement',1,'supprimer',NULL,'d',0),(174,'Lire toutes les notes de frais','deplacement',1,'readall',NULL,'d',0),(178,'Exporter les notes de frais et deplacements','deplacement',1,'export',NULL,'d',0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',1),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0),(229,'Supprimer les mailings)','mailing',1,'supprimer',NULL,'d',1),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',1),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',1),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',1,'client','voir','r',1),(262,'Consulter tous les tiers par utilisateurs internes (sinon uniquement si contact commercial). Non effectif pour utilisateurs externes (tjs limités à eux-meme).','societe',2,'client','voir','r',1),(281,'Lire les contacts','societe',1,'contact','lire','r',1),(281,'Lire les contacts','societe',2,'contact','lire','r',1),(282,'Creer modifier les contacts','societe',1,'contact','creer','w',0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0),(283,'Supprimer les contacts','societe',1,'contact','supprimer','d',0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0),(286,'Exporter les contacts','societe',1,'contact','export','d',0),(286,'Exporter les contacts','societe',2,'contact','export','d',0),(300,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1),(301,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',1),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',1),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',1),(343,'Modifier son propre mot de passe','user',1,'self','password','w',1),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',1),(351,'Consulter les groupes','user',1,'group_advance','read','r',0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0),(531,'Lire les services','service',1,'lire',NULL,'r',1),(532,'Creer/modifier les services','service',1,'creer',NULL,'w',0),(534,'Supprimer les services','service',1,'supprimer',NULL,'d',0),(538,'Exporter les services','service',1,'export',NULL,'r',0),(700,'Lire les dons','don',1,'lire',NULL,'r',1),(701,'Creer/modifier les dons','don',1,'creer',NULL,'w',0),(701,'Lire les dons','don',2,'lire',NULL,'r',1),(702,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',1),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',1),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',1),(1101,'Lire les bons de livraison','expedition',1,'livraison','lire','r',1),(1102,'Creer modifier les bons de livraison','expedition',1,'livraison','creer','w',0),(1104,'Valider les bons de livraison','expedition',1,'livraison','valider','d',0),(1109,'Supprimer les bons de livraison','expedition',1,'livraison','supprimer','d',0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',1),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',1),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',1),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',1),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0),(1237,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',1,'facture','export','r',0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0),(1421,'Exporter les commandes clients et attributs','commande',1,'commande','export','r',0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',1),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0),(2501,'Consulter/Télécharger les documents','ecm',1,'read',NULL,'r',1),(2503,'Soumettre ou supprimer des documents','ecm',1,'upload',NULL,'w',1),(2515,'Administrer les rubriques de documents','ecm',1,'setup',NULL,'w',1),(20001,'Read your own holidays','holiday',1,'read',NULL,'w',1),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1),(20002,'Create/modify your own holidays','holiday',1,'write',NULL,'w',1),(20002,'Lire / Modifier toutes les demandes de congés payés','holiday',2,'lire_tous',NULL,'w',0),(20003,'Delete holidays','holiday',1,'delete',NULL,'w',0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0),(20004,'Read holidays for everybody','holiday',1,'read_all',NULL,'w',0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0),(20005,'Create/modify holidays for everybody','holiday',1,'write_all',NULL,'w',0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0),(20006,'Setup holidays of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',1),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0),(50101,'Use point of sale','cashdesk',1,'use',NULL,'a',1),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0),(400051,'Use POS','pos',2,'frontend',NULL,'a',1),(400052,'Use Backend','pos',2,'backend',NULL,'a',1),(400053,'Make Transfers','pos',2,'transfer',NULL,'a',1),(400055,'Stats','pos',2,'stats',NULL,'a',1);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7762,7 +7762,7 @@ CREATE TABLE `llx_societe` (
 
 LOCK TABLES `llx_societe` WRITE;
 /*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */;
-INSERT INTO `llx_societe` VALUES (1,0,NULL,'2012-12-19 14:47:50','2010-07-08 14:21:44','ABC and Co',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,4,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,1,NULL,0,NULL,NULL,NULL,'en_IN',NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(2,0,NULL,'2011-07-31 22:35:08','2010-07-08 14:23:48','Belin SARL',1,NULL,NULL,'CU1108-0001','SU1108-0001',NULL,NULL,'11 rue de la paix.','75000','Paris',0,117,NULL,NULL,'dolibarr.fr',NULL,NULL,NULL,3,NULL,'0','123456789','','ACE14','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'fr_FR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(3,0,NULL,'2010-07-08 20:42:12','2010-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP',NULL,NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'es_AR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(4,0,NULL,'2013-03-03 23:09:48','2010-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(5,0,NULL,'2010-07-08 21:37:56','2010-07-08 23:22:57','NoCountry Co',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,193,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(6,0,NULL,'2010-07-08 22:25:06','2010-07-09 00:15:09','Swiss customer supplier',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'abademail@aa.com',NULL,2,2,601,'0','','','','','',56000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(7,0,NULL,'2013-02-12 16:06:20','2010-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(10,0,NULL,'2012-12-08 16:38:30','2010-07-10 15:13:08','Smith Vick',1,NULL,NULL,'CU1212-0005',NULL,NULL,NULL,'',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(11,0,NULL,'2010-07-11 12:35:22','2010-07-10 18:35:57','Mon client',1,NULL,NULL,NULL,NULL,'7051',NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(12,0,NULL,'2015-10-03 09:08:58','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL),(13,0,NULL,'2010-07-11 15:13:20','2010-07-11 17:13:20','Vendeur de chips',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(17,0,NULL,'2015-10-03 10:12:11','2011-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,NULL,'The French Company',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,1,3,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL),(19,0,NULL,'2014-03-02 19:09:52','2013-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,0,NULL,'0','','','10/10/2010','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(25,0,NULL,'2015-10-03 09:21:44','2013-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL);
+INSERT INTO `llx_societe` VALUES (1,0,NULL,'2012-12-19 14:47:50','2010-07-08 14:21:44','ABC and Co',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,4,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,1,NULL,0,NULL,NULL,NULL,'en_IN',NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(2,0,NULL,'2011-07-31 22:35:08','2010-07-08 14:23:48','Belin SARL',1,NULL,NULL,'CU1108-0001','SU1108-0001',NULL,NULL,'11 rue de la paix.','75000','Paris',0,117,NULL,NULL,'dolibarr.fr',NULL,NULL,NULL,3,NULL,'0','123456789','','ACE14','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'fr_FR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(3,0,NULL,'2010-07-08 20:42:12','2010-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP',NULL,NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,'es_AR',NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(4,0,NULL,'2013-03-03 23:09:48','2010-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(5,0,NULL,'2010-07-08 21:37:56','2010-07-08 23:22:57','NoCountry Co',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,193,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(6,0,NULL,'2010-07-08 22:25:06','2010-07-09 00:15:09','Swiss customer supplier',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'abademail@aa.com',NULL,2,2,601,'0','','','','','',56000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL),(7,0,NULL,'2013-02-12 16:06:20','2010-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(10,0,NULL,'2012-12-08 16:38:30','2010-07-10 15:13:08','Smith Vick',1,NULL,NULL,'CU1212-0005',NULL,NULL,NULL,'',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(11,0,NULL,'2015-10-05 20:49:48','2010-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,11,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL),(12,0,NULL,'2015-10-05 19:57:57','2010-07-11 16:18:08','Dupont Alain',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL),(13,0,NULL,'2015-10-05 20:50:23','2010-07-11 17:13:20','Company Corp 2',1,NULL,NULL,NULL,'SU1510-0008',NULL,NULL,'',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,11,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,'',0,NULL),(17,0,NULL,'2015-10-03 10:12:11','2011-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,NULL,'The French Company',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,1,3,NULL,'0','','','','','',0,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,'',0,NULL),(19,0,NULL,'2014-03-02 19:09:52','2013-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,0,NULL,'0','','','10/10/2010','','',0,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'en_US','patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,NULL),(25,0,NULL,'2015-10-03 09:21:44','2013-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,0,NULL,'0','','','','','',0,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,1,0,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,'',0,NULL);
 /*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7815,7 +7815,7 @@ CREATE TABLE `llx_societe_commerciaux` (
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_commerciaux` (`fk_soc`,`fk_user`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7824,7 +7824,7 @@ CREATE TABLE `llx_societe_commerciaux` (
 
 LOCK TABLES `llx_societe_commerciaux` WRITE;
 /*!40000 ALTER TABLE `llx_societe_commerciaux` DISABLE KEYS */;
-INSERT INTO `llx_societe_commerciaux` VALUES (1,2,2),(2,3,2),(5,17,1),(6,19,1),(8,19,3);
+INSERT INTO `llx_societe_commerciaux` VALUES (1,2,2),(2,3,2),(9,11,16),(10,13,17),(5,17,1),(6,19,1),(8,19,3);
 /*!40000 ALTER TABLE `llx_societe_commerciaux` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7843,7 +7843,7 @@ CREATE TABLE `llx_societe_extrafields` (
   `anotheraddedfield` varchar(15) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=55 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7852,7 +7852,7 @@ CREATE TABLE `llx_societe_extrafields` (
 
 LOCK TABLES `llx_societe_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_societe_extrafields` DISABLE KEYS */;
-INSERT INTO `llx_societe_extrafields` VALUES (1,'2011-06-22 16:23:01',40,NULL,NULL),(2,'2011-06-22 16:23:16',41,NULL,NULL),(4,'2011-06-23 07:40:40',39,NULL,NULL),(12,'2011-06-29 13:03:12',42,NULL,NULL),(14,'2011-07-02 01:24:03',57,NULL,NULL),(16,'2011-07-02 14:11:29',60,NULL,NULL),(17,'2011-07-18 10:26:55',35,NULL,NULL),(18,'2011-07-31 22:35:08',2,NULL,NULL),(28,'2012-12-08 16:38:30',10,NULL,NULL),(30,'2012-12-19 14:47:50',1,NULL,NULL),(33,'2013-02-12 16:06:20',7,NULL,NULL),(44,'2013-03-03 23:08:04',4,NULL,NULL),(49,'2014-03-02 19:09:52',19,NULL,NULL),(51,'2015-10-03 09:09:23',12,NULL,NULL),(53,'2015-10-03 09:21:44',25,NULL,NULL),(54,'2015-10-03 10:12:11',17,NULL,NULL);
+INSERT INTO `llx_societe_extrafields` VALUES (1,'2011-06-22 16:23:01',40,NULL,NULL),(2,'2011-06-22 16:23:16',41,NULL,NULL),(4,'2011-06-23 07:40:40',39,NULL,NULL),(12,'2011-06-29 13:03:12',42,NULL,NULL),(14,'2011-07-02 01:24:03',57,NULL,NULL),(16,'2011-07-02 14:11:29',60,NULL,NULL),(17,'2011-07-18 10:26:55',35,NULL,NULL),(18,'2011-07-31 22:35:08',2,NULL,NULL),(28,'2012-12-08 16:38:30',10,NULL,NULL),(30,'2012-12-19 14:47:50',1,NULL,NULL),(33,'2013-02-12 16:06:20',7,NULL,NULL),(44,'2013-03-03 23:08:04',4,NULL,NULL),(49,'2014-03-02 19:09:52',19,NULL,NULL),(53,'2015-10-03 09:21:44',25,NULL,NULL),(54,'2015-10-03 10:12:11',17,NULL,NULL),(56,'2015-10-05 19:57:57',12,NULL,NULL),(57,'2015-10-05 20:49:48',11,NULL,NULL),(58,'2015-10-05 20:50:23',13,NULL,NULL);
 /*!40000 ALTER TABLE `llx_societe_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8069,7 +8069,7 @@ CREATE TABLE `llx_socpeople` (
   KEY `idx_socpeople_fk_user_creat` (`fk_user_creat`),
   CONSTRAINT `fk_socpeople_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_socpeople_user_creat_user_rowid` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8078,7 +8078,7 @@ CREATE TABLE `llx_socpeople` (
 
 LOCK TABLES `llx_socpeople` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */;
-INSERT INTO `llx_socpeople` VALUES (1,'2010-07-08 14:26:14','2010-07-08 20:45:28',1,1,NULL,'MR','Samira','Aljoun','','','',297,117,'2010-07-08','Project leader','','','','','','',NULL,0,0,1,1,'Met during a congress at Dubai',NULL,NULL,NULL,NULL,1),(2,'2010-07-08 22:44:50','2010-07-08 20:59:57',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','',NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2010-07-08 22:59:02','2015-10-03 09:39:51',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','','',1,0,1,1,'This is a private contact','',NULL,NULL,NULL,1),(4,'2010-07-09 00:16:58','2010-07-08 22:16:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','',NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2015-10-03 10:01:15',17,1,NULL,'','Bookkeeper','Alex','99 account street','123456','BigTown',NULL,4,NULL,'book keeper','','','','','','','',0,0,1,1,'','',NULL,NULL,NULL,1);
+INSERT INTO `llx_socpeople` VALUES (1,'2010-07-08 14:26:14','2010-07-08 20:45:28',1,1,NULL,'MR','Samira','Aljoun','','','',297,117,'2010-07-08','Project leader','','','','','','',NULL,0,0,1,1,'Met during a congress at Dubai',NULL,NULL,NULL,NULL,1),(2,'2010-07-08 22:44:50','2010-07-08 20:59:57',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','',NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2010-07-08 22:59:02','2015-10-03 09:39:51',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','','',1,0,1,1,'This is a private contact','',NULL,NULL,NULL,1),(4,'2010-07-09 00:16:58','2010-07-08 22:16:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','',NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2011-08-01 02:41:26','2015-10-05 07:11:41',17,1,NULL,'','Bookkeeper','Bob','99 account street','123456','BigTown',NULL,4,NULL,'book keeper','','','','','','','',0,0,1,1,'','',NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8282,7 +8282,7 @@ CREATE TABLE `llx_user` (
   UNIQUE KEY `uk_user_fk_member` (`fk_member`),
   KEY `idx_user_api_key` (`api_key`),
   KEY `idx_user_fk_societe` (`fk_soc`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8291,7 +8291,7 @@ CREATE TABLE `llx_user` (
 
 LOCK TABLES `llx_user` WRITE;
 /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */;
-INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2015-10-03 09:43:40',NULL,NULL,'admin',0,NULL,NULL,NULL,'admindemo','c84258e9c39059a89ab77d846ddab909',NULL,NULL,'Einstein','Albert','President','','123456789','','','alexadmin@example.com','',1,'','','',1,1,NULL,NULL,NULL,'','2015-10-03 11:43:50','2014-12-21 20:52:09',NULL,'',1,'alberteinstein.jpg',NULL,NULL,NULL,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(2,'2010-07-08 13:54:48','2015-10-03 09:07:36',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'John','Doe','','','09123123','','','johndoe@mycompany.com','',0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,'johndoe.png',NULL,NULL,1,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(3,'2010-07-11 16:18:59','2015-10-03 09:09:23',NULL,NULL,'pcurie',1,NULL,NULL,NULL,'pcuriedolibarr','ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Pierre','Curie','','','','','','pcurie@example.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2015-10-03 10:01:39',NULL,NULL,'bookkeeper',1,NULL,NULL,NULL,'athestudent','9c98d27c557c6aabfb4125c0941037c8',NULL,NULL,'Bookkeeper','Alex','','','','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(10,'2015-10-03 11:47:41','2015-10-03 09:47:53',NULL,NULL,'mcurie',1,NULL,NULL,NULL,'mcuriedolibarr','c89846eb5971a43ff467b8a206732ebc',NULL,'t3mnkbhs','Curie','Marie','','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,NULL,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'woman');
+INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2015-10-05 20:07:36',NULL,NULL,'aeinstein',0,NULL,NULL,NULL,'aeinstein','11c9c772d6471aa24c27274bdd8a223b',NULL,NULL,'Einstein','Albert','','','123456789','','','aeinstein@example.com','',0,'','','',1,1,NULL,NULL,NULL,'','2015-10-05 08:32:44','2015-10-03 11:43:50',NULL,'',1,'alberteinstein.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'aaaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(2,'2010-07-08 13:54:48','2015-10-05 19:47:22',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,NULL,'Doe','David','','','09123123','','','daviddoe@mycompany.com','',0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,'johndoe.png',NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(3,'2010-07-11 16:18:59','2015-10-05 19:57:57',NULL,NULL,'pcurie',1,NULL,NULL,NULL,'pcuriedolibarr','ab335b4eb4c3c99334f656e5db9584c9',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2015-10-05 20:08:34',NULL,NULL,'bbookkeeper',1,NULL,NULL,NULL,'bbookkeeper','a7d30b58d647fcf59b7163f9592b1dbb',NULL,NULL,'Bookkeeper','Bob','Bookkeeper','','','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf<br />\r\nfsdfsd<br />\r\n<strong>fsdfs</strong>',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL),(10,'2015-10-03 11:47:41','2015-10-05 20:07:18',NULL,NULL,'mcurie',1,NULL,NULL,NULL,'mcurie','11c9c772d6471aa24c27274bdd8a223b',NULL,'t3mnkbhs','Curie','Marie','','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,'mariecurie.jpg',NULL,NULL,14,NULL,'','','',NULL,NULL,'ffaaff','',NULL,0,0,NULL,NULL,NULL,NULL,'woman'),(11,'2015-10-05 09:07:52','2015-10-05 19:57:02',NULL,NULL,'zzeceo',1,NULL,NULL,NULL,'zzeceo','92af989c4c3a5140fb5d73eb77a52454',NULL,'cq78nf9m','Zeceo','Zack','President','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 22:48:08','2015-10-05 21:18:46',NULL,'',1,NULL,NULL,NULL,NULL,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL),(12,'2015-10-05 09:09:46','2015-10-05 21:07:57',NULL,NULL,'admin',1,NULL,NULL,NULL,'admin2','21232f297a57a5a743894a0e4a801fc3',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','','',1,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'','2015-11-04 16:17:06','2015-10-05 23:44:00',NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'woman'),(13,'2015-10-05 21:29:35','2015-10-05 20:06:25',NULL,NULL,'ccommercy',1,NULL,NULL,NULL,'ccomercy','11c9c772d6471aa24c27274bdd8a223b',NULL,'y451ksdv','Commery','Charly','Commercial leader','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,'man'),(14,'2015-10-05 21:33:33','2015-10-05 19:52:05',NULL,NULL,'sscientol',1,NULL,NULL,NULL,'sscientol','39bee07ac42f31c98e79cdcd5e5fe4c5',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,11,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL),(16,'2015-10-05 22:47:52','2015-10-05 21:12:28',NULL,NULL,'cc1',1,NULL,NULL,NULL,'cc1','d68005ccf362b82d084551b6291792a3',NULL,'cx9y1dk0','cc1','','Admin Technical','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:46:24','2015-10-05 23:37:31',NULL,'',1,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL),(17,'2015-10-05 22:48:39','2015-10-05 20:48:39',NULL,NULL,'cc2',1,NULL,NULL,NULL,'cc2','a964065211872fb76f876c6c3e952ea3',NULL,'gw8cb7xj','cc2','','','','','','','','',0,NULL,NULL,NULL,1,1,NULL,NULL,NULL,'','2015-10-05 23:16:06',NULL,NULL,'',1,NULL,NULL,NULL,13,NULL,'','','',NULL,NULL,'','',NULL,0,0,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8395,7 +8395,7 @@ CREATE TABLE `llx_user_param` (
 
 LOCK TABLES `llx_user_param` WRITE;
 /*!40000 ALTER TABLE `llx_user_param` DISABLE KEYS */;
-INSERT INTO `llx_user_param` VALUES (1,1,'MAIN_BOXES_0','1'),(1,1,'MAIN_THEME','eldy'),(1,3,'THEME_ELDY_ENABLE_PERSONALIZED','1'),(1,1,'THEME_ELDY_RGB','ded0ed'),(1,3,'THEME_ELDY_RGB','d0ddc3');
+INSERT INTO `llx_user_param` VALUES (1,1,'MAIN_BOXES_0','1'),(1,1,'MAIN_THEME','eldy'),(1,3,'THEME_ELDY_ENABLE_PERSONALIZED','1'),(1,1,'THEME_ELDY_RGB','ded0ed'),(1,3,'THEME_ELDY_RGB','d0ddc3'),(11,1,'MAIN_BOXES_0','1');
 /*!40000 ALTER TABLE `llx_user_param` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8413,7 +8413,7 @@ CREATE TABLE `llx_user_rights` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_rights` (`fk_user`,`fk_id`),
   CONSTRAINT `fk_user_rights_fk_user_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=12664 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=13306 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8422,7 +8422,7 @@ CREATE TABLE `llx_user_rights` (
 
 LOCK TABLES `llx_user_rights` WRITE;
 /*!40000 ALTER TABLE `llx_user_rights` DISABLE KEYS */;
-INSERT INTO `llx_user_rights` VALUES (12402,1,11),(12380,1,12),(12385,1,13),(12389,1,14),(12393,1,15),(12398,1,16),(12404,1,19),(9726,1,21),(9700,1,22),(9706,1,24),(9711,1,25),(9716,1,26),(9722,1,27),(9728,1,28),(9978,1,31),(9968,1,32),(9974,1,34),(1910,1,36),(9980,1,38),(11573,1,41),(11574,1,42),(11575,1,44),(11576,1,45),(7184,1,61),(7181,1,62),(7183,1,64),(7185,1,67),(7186,1,68),(1678,1,71),(1673,1,72),(1675,1,74),(1679,1,75),(1677,1,76),(1681,1,78),(1682,1,79),(12322,1,81),(12309,1,82),(12312,1,84),(12314,1,86),(12317,1,87),(12320,1,88),(12323,1,89),(11580,1,91),(11581,1,92),(11582,1,93),(11583,1,94),(10097,1,95),(10099,1,96),(10103,1,97),(10104,1,98),(7139,1,101),(7134,1,102),(7136,1,104),(7137,1,105),(7138,1,106),(7140,1,109),(10229,1,111),(10201,1,112),(10207,1,113),(10213,1,114),(10219,1,115),(10225,1,116),(10231,1,117),(12518,1,121),(12508,1,122),(12514,1,125),(12520,1,126),(11577,1,141),(11578,1,142),(11579,1,144),(2307,1,151),(2304,1,152),(2306,1,153),(2308,1,154),(10092,1,161),(10093,1,162),(10094,1,163),(10095,1,164),(10096,1,165),(1585,1,170),(12342,1,171),(12331,1,172),(12335,1,173),(12339,1,174),(12343,1,178),(10000,1,221),(9990,1,222),(9996,1,223),(10002,1,229),(10007,1,237),(10011,1,238),(10015,1,239),(1686,1,241),(1685,1,242),(1687,1,243),(12604,1,251),(12566,1,252),(12569,1,253),(12572,1,254),(12575,1,255),(12579,1,256),(1617,1,258),(12525,1,262),(12544,1,281),(12534,1,282),(12540,1,283),(12546,1,286),(12288,1,300),(12290,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(12582,1,341),(12584,1,342),(12586,1,343),(12588,1,344),(12600,1,351),(12593,1,352),(12597,1,353),(12601,1,354),(12605,1,358),(12560,1,531),(12553,1,532),(12557,1,534),(1625,1,536),(12561,1,538),(12358,1,700),(12348,1,701),(12354,1,702),(12360,1,703),(1755,1,1001),(1754,1,1002),(1756,1,1003),(1758,1,1004),(1759,1,1005),(7146,1,1101),(7143,1,1102),(7145,1,1104),(7147,1,1109),(12412,1,1181),(12458,1,1182),(12417,1,1183),(12420,1,1184),(12423,1,1185),(12427,1,1186),(12431,1,1187),(12437,1,1188),(12434,1,1189),(1578,1,1201),(1579,1,1202),(12454,1,1231),(12443,1,1232),(12446,1,1233),(12449,1,1234),(12452,1,1235),(12455,1,1236),(12459,1,1237),(1736,1,1251),(12409,1,1321),(12326,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(12264,1,2401),(12260,1,2402),(12266,1,2403),(12280,1,2411),(12276,1,2412),(12282,1,2413),(12286,1,2414),(1618,1,2500),(12370,1,2501),(12367,1,2503),(12371,1,2515),(9610,1,5001),(9611,1,5002),(12490,1,20001),(12468,1,20002),(12474,1,20003),(12480,1,20004),(12486,1,20005),(12492,1,20006),(12302,1,23001),(12295,1,23002),(12299,1,23003),(12303,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(12498,1,55001),(12499,1,55002),(3564,1,100700),(3565,1,100701),(9596,1,101051),(9598,1,101052),(9600,1,101053),(9604,1,101060),(9605,1,101061),(7177,1,101201),(7178,1,101202),(10353,1,101250),(10355,1,101251),(8980,1,101261),(8981,1,101262),(7616,1,101331),(10030,1,101701),(10031,1,101702),(3582,1,102000),(3583,1,102001),(9819,1,400051),(9823,1,400052),(9827,1,400053),(9831,1,400055),(132,2,11),(133,2,12),(134,2,13),(135,2,14),(136,2,16),(137,2,19),(138,2,21),(139,2,22),(140,2,24),(141,2,25),(142,2,26),(143,2,27),(10359,2,31),(145,2,32),(10361,2,34),(146,2,36),(147,2,41),(148,2,42),(149,2,44),(150,2,61),(151,2,62),(152,2,64),(153,2,71),(154,2,72),(155,2,74),(156,2,75),(157,2,78),(158,2,79),(159,2,81),(160,2,82),(161,2,84),(162,2,86),(163,2,87),(164,2,88),(165,2,89),(166,2,91),(167,2,92),(168,2,93),(2475,2,95),(2476,2,96),(2477,2,97),(2478,2,98),(169,2,101),(170,2,102),(171,2,104),(172,2,109),(173,2,111),(174,2,112),(175,2,113),(176,2,114),(177,2,116),(178,2,117),(179,2,121),(180,2,122),(181,2,125),(182,2,141),(183,2,142),(184,2,144),(2479,2,151),(2480,2,152),(2481,2,153),(2482,2,154),(185,2,161),(186,2,162),(187,2,163),(188,2,164),(189,2,165),(190,2,170),(2471,2,171),(192,2,172),(2472,2,173),(193,2,221),(194,2,222),(195,2,229),(196,2,241),(197,2,242),(198,2,243),(199,2,251),(201,2,262),(202,2,281),(203,2,282),(204,2,283),(205,2,331),(2483,2,531),(207,2,532),(2484,2,534),(208,2,536),(2473,2,700),(210,2,701),(211,2,702),(2474,2,703),(212,2,1001),(213,2,1002),(214,2,1003),(215,2,1004),(216,2,1005),(217,2,1101),(218,2,1102),(219,2,1104),(220,2,1109),(221,2,1181),(222,2,1182),(223,2,1183),(224,2,1184),(225,2,1185),(226,2,1186),(227,2,1187),(228,2,1188),(229,2,1201),(230,2,1202),(231,2,1231),(232,2,1232),(233,2,1233),(234,2,1234),(235,2,1421),(236,2,2401),(237,2,2402),(238,2,2403),(239,2,2411),(240,2,2412),(241,2,2413),(242,2,2500),(2470,2,2501),(243,2,2515),(10363,2,20001),(10364,2,20002),(10365,2,20003),(10366,2,20004),(10367,2,20005),(10368,2,20006),(10362,2,50101),(10372,2,101250),(1807,3,11),(1808,3,31),(1809,3,36),(1810,3,41),(1811,3,61),(1812,3,71),(1813,3,72),(1814,3,74),(1815,3,75),(1816,3,78),(1817,3,79),(1818,3,91),(1819,3,95),(1820,3,97),(1821,3,111),(1822,3,121),(1823,3,122),(1824,3,125),(1825,3,161),(1826,3,170),(1827,3,171),(1828,3,172),(1829,3,221),(1830,3,222),(1831,3,229),(1832,3,241),(1833,3,242),(1834,3,243),(1835,3,251),(1836,3,255),(1837,3,256),(1838,3,262),(1839,3,281),(1840,3,282),(1841,3,283),(1842,3,331),(1843,3,531),(1844,3,536),(1845,3,700),(1846,3,1001),(1847,3,1002),(1848,3,1003),(1849,3,1004),(1850,3,1005),(1851,3,1181),(1852,3,1182),(1853,3,1201),(1854,3,1202),(1855,3,1231),(1856,3,2401),(1857,3,2402),(1858,3,2403),(1859,3,2411),(1860,3,2412),(1861,3,2413),(1862,3,2500),(1863,3,2515),(8026,4,11),(8027,4,21),(8028,4,31),(8029,4,41),(8030,4,61),(8031,4,71),(8032,4,72),(8033,4,74),(8034,4,75),(8035,4,78),(8036,4,79),(8037,4,81),(8038,4,91),(8039,4,95),(8040,4,97),(8041,4,101),(8042,4,111),(8043,4,121),(8044,4,151),(8045,4,161),(8046,4,171),(8047,4,221),(8048,4,222),(8049,4,229),(8050,4,241),(8051,4,242),(8052,4,243),(8146,4,251),(8147,4,253),(8053,4,262),(8054,4,281),(8055,4,331),(8056,4,341),(8057,4,342),(8058,4,343),(8059,4,344),(8060,4,531),(8061,4,700),(8062,4,1001),(8063,4,1002),(8064,4,1003),(8065,4,1004),(8066,4,1005),(8067,4,1101),(8068,4,1181),(8069,4,1182),(8070,4,1201),(8071,4,1202),(8072,4,1231),(8073,4,2401),(8074,4,2501),(8075,4,2503),(8076,4,2515),(8077,4,20001),(8078,4,50101),(8079,4,101201),(8080,4,101261),(8081,4,102000),(8082,4,400051),(8083,4,400052),(8084,4,400053),(8085,4,400055),(8194,6,11),(8195,6,21),(8196,6,31),(8197,6,41),(8198,6,61),(8199,6,71),(8200,6,72),(8201,6,74),(8202,6,75),(8203,6,78),(8204,6,79),(8205,6,81),(8206,6,91),(8207,6,95),(8208,6,97),(8209,6,101),(8210,6,111),(8211,6,121),(8212,6,151),(8213,6,161),(8214,6,171),(8215,6,221),(8216,6,222),(8217,6,229),(8218,6,241),(8219,6,242),(8220,6,243),(8221,6,262),(8222,6,281),(8223,6,331),(8224,6,341),(8225,6,342),(8226,6,343),(8227,6,344),(8228,6,531),(8229,6,700),(8230,6,1001),(8231,6,1002),(8232,6,1003),(8233,6,1004),(8234,6,1005),(8235,6,1101),(8236,6,1181),(8237,6,1182),(8238,6,1201),(8239,6,1202),(8240,6,1231),(8241,6,1791),(8242,6,2401),(8243,6,2501),(8244,6,2503),(8245,6,2515),(8246,6,5001),(8247,6,20001),(8248,6,50101),(8249,6,101201),(8250,6,101261),(8251,6,102000),(8252,6,400051),(8253,6,400052),(8254,6,400053),(8255,6,400055),(8256,7,11),(8257,7,21),(8258,7,31),(8259,7,41),(8260,7,61),(8261,7,71),(8262,7,72),(8263,7,74),(8264,7,75),(8265,7,78),(8266,7,79),(8267,7,81),(8268,7,91),(8269,7,95),(8270,7,97),(8271,7,101),(8272,7,111),(8273,7,121),(8274,7,151),(8275,7,161),(8276,7,171),(8277,7,221),(8278,7,222),(8279,7,229),(8280,7,241),(8281,7,242),(8282,7,243),(8283,7,262),(8284,7,281),(8285,7,331),(8286,7,341),(8287,7,342),(8288,7,343),(8289,7,344),(8290,7,531),(8291,7,700),(8292,7,1001),(8293,7,1002),(8294,7,1003),(8295,7,1004),(8296,7,1005),(8297,7,1101),(8298,7,1181),(8299,7,1182),(8300,7,1201),(8301,7,1202),(8302,7,1231),(8303,7,1791),(8304,7,2401),(8305,7,2501),(8306,7,2503),(8307,7,2515),(8308,7,5001),(8309,7,20001),(8310,7,50101),(8311,7,101201),(8312,7,101261),(8313,7,102000),(8314,7,400051),(8315,7,400052),(8316,7,400053),(8317,7,400055),(8318,9,11),(8319,9,21),(8320,9,31),(8321,9,41),(8322,9,61),(8323,9,71),(8324,9,72),(8325,9,74),(8326,9,75),(8327,9,78),(8328,9,79),(8329,9,81),(8330,9,91),(8331,9,95),(8332,9,97),(8333,9,101),(8334,9,111),(8335,9,121),(8336,9,151),(8337,9,161),(8338,9,171),(8339,9,221),(8340,9,222),(8341,9,229),(8342,9,241),(8343,9,242),(8344,9,243),(8345,9,262),(8346,9,281),(8347,9,331),(8348,9,341),(8349,9,342),(8350,9,343),(8351,9,344),(8352,9,531),(8353,9,700),(8354,9,1001),(8355,9,1002),(8356,9,1003),(8357,9,1004),(8358,9,1005),(8359,9,1101),(8360,9,1181),(8361,9,1182),(8362,9,1201),(8363,9,1202),(8364,9,1231),(8365,9,1791),(8366,9,2401),(8367,9,2501),(8368,9,2503),(8369,9,2515),(8370,9,5001),(8371,9,20001),(8372,9,50101),(8373,9,101201),(8374,9,101261),(8375,9,102000),(8376,9,400051),(8377,9,400052),(8378,9,400053),(8379,9,400055),(12608,10,11),(12609,10,21),(12610,10,31),(12611,10,41),(12612,10,61),(12613,10,71),(12614,10,72),(12615,10,74),(12616,10,75),(12617,10,78),(12618,10,79),(12619,10,81),(12620,10,91),(12621,10,95),(12622,10,97),(12623,10,101),(12624,10,111),(12625,10,121),(12626,10,151),(12627,10,161),(12628,10,171),(12629,10,221),(12630,10,222),(12631,10,229),(12632,10,241),(12633,10,242),(12634,10,243),(12635,10,262),(12636,10,281),(12637,10,300),(12638,10,331),(12639,10,341),(12640,10,342),(12641,10,343),(12642,10,344),(12643,10,531),(12644,10,700),(12645,10,1001),(12646,10,1002),(12647,10,1003),(12648,10,1004),(12649,10,1005),(12650,10,1101),(12651,10,1181),(12652,10,1182),(12653,10,1201),(12654,10,1202),(12655,10,1231),(12656,10,2401),(12657,10,2501),(12658,10,2503),(12659,10,2515),(12660,10,20001),(12661,10,20002),(12662,10,23001),(12663,10,50101);
+INSERT INTO `llx_user_rights` VALUES (12402,1,11),(12380,1,12),(12385,1,13),(12389,1,14),(12393,1,15),(12398,1,16),(12404,1,19),(9726,1,21),(9700,1,22),(9706,1,24),(9711,1,25),(9716,1,26),(9722,1,27),(9728,1,28),(9978,1,31),(9968,1,32),(9974,1,34),(1910,1,36),(9980,1,38),(11573,1,41),(11574,1,42),(11575,1,44),(11576,1,45),(7184,1,61),(7181,1,62),(7183,1,64),(7185,1,67),(7186,1,68),(1678,1,71),(1673,1,72),(1675,1,74),(1679,1,75),(1677,1,76),(1681,1,78),(1682,1,79),(12322,1,81),(12309,1,82),(12312,1,84),(12314,1,86),(12317,1,87),(12320,1,88),(12323,1,89),(11580,1,91),(11581,1,92),(11582,1,93),(11583,1,94),(10097,1,95),(10099,1,96),(10103,1,97),(10104,1,98),(7139,1,101),(7134,1,102),(7136,1,104),(7137,1,105),(7138,1,106),(7140,1,109),(10229,1,111),(10201,1,112),(10207,1,113),(10213,1,114),(10219,1,115),(10225,1,116),(10231,1,117),(12518,1,121),(12508,1,122),(12514,1,125),(12520,1,126),(11577,1,141),(11578,1,142),(11579,1,144),(2307,1,151),(2304,1,152),(2306,1,153),(2308,1,154),(10092,1,161),(10093,1,162),(10094,1,163),(10095,1,164),(10096,1,165),(1585,1,170),(12342,1,171),(12331,1,172),(12335,1,173),(12339,1,174),(12343,1,178),(10000,1,221),(9990,1,222),(9996,1,223),(10002,1,229),(10007,1,237),(10011,1,238),(10015,1,239),(1686,1,241),(1685,1,242),(1687,1,243),(12604,1,251),(12566,1,252),(12569,1,253),(12572,1,254),(12575,1,255),(12579,1,256),(1617,1,258),(12525,1,262),(12544,1,281),(12534,1,282),(12540,1,283),(12546,1,286),(12288,1,300),(12290,1,301),(11591,1,302),(1763,1,331),(1762,1,332),(1764,1,333),(12582,1,341),(12584,1,342),(12586,1,343),(12588,1,344),(12600,1,351),(12593,1,352),(12597,1,353),(12601,1,354),(12605,1,358),(12560,1,531),(12553,1,532),(12557,1,534),(1625,1,536),(12561,1,538),(12358,1,700),(12348,1,701),(12354,1,702),(12360,1,703),(1755,1,1001),(1754,1,1002),(1756,1,1003),(1758,1,1004),(1759,1,1005),(7146,1,1101),(7143,1,1102),(7145,1,1104),(7147,1,1109),(12412,1,1181),(12458,1,1182),(12417,1,1183),(12420,1,1184),(12423,1,1185),(12427,1,1186),(12431,1,1187),(12437,1,1188),(12434,1,1189),(1578,1,1201),(1579,1,1202),(12454,1,1231),(12443,1,1232),(12446,1,1233),(12449,1,1234),(12452,1,1235),(12455,1,1236),(12459,1,1237),(1736,1,1251),(12409,1,1321),(12326,1,1421),(8190,1,1791),(8187,1,1792),(8191,1,1793),(12264,1,2401),(12260,1,2402),(12266,1,2403),(12280,1,2411),(12276,1,2412),(12282,1,2413),(12286,1,2414),(1618,1,2500),(12370,1,2501),(12367,1,2503),(12371,1,2515),(9610,1,5001),(9611,1,5002),(12490,1,20001),(12468,1,20002),(12474,1,20003),(12480,1,20004),(12486,1,20005),(12492,1,20006),(12302,1,23001),(12295,1,23002),(12299,1,23003),(12303,1,23004),(7701,1,50101),(4984,1,50401),(4983,1,50402),(4985,1,50403),(4987,1,50411),(4988,1,50412),(4989,1,50415),(12498,1,55001),(12499,1,55002),(3564,1,100700),(3565,1,100701),(9596,1,101051),(9598,1,101052),(9600,1,101053),(9604,1,101060),(9605,1,101061),(7177,1,101201),(7178,1,101202),(10353,1,101250),(10355,1,101251),(8980,1,101261),(8981,1,101262),(7616,1,101331),(10030,1,101701),(10031,1,101702),(3582,1,102000),(3583,1,102001),(9819,1,400051),(9823,1,400052),(9827,1,400053),(9831,1,400055),(132,2,11),(133,2,12),(134,2,13),(135,2,14),(136,2,16),(137,2,19),(138,2,21),(139,2,22),(140,2,24),(141,2,25),(142,2,26),(143,2,27),(10359,2,31),(145,2,32),(10361,2,34),(146,2,36),(147,2,41),(148,2,42),(149,2,44),(150,2,61),(151,2,62),(152,2,64),(153,2,71),(154,2,72),(155,2,74),(156,2,75),(157,2,78),(158,2,79),(159,2,81),(160,2,82),(161,2,84),(162,2,86),(163,2,87),(164,2,88),(165,2,89),(166,2,91),(167,2,92),(168,2,93),(2475,2,95),(2476,2,96),(2477,2,97),(2478,2,98),(169,2,101),(170,2,102),(171,2,104),(172,2,109),(173,2,111),(174,2,112),(175,2,113),(176,2,114),(177,2,116),(178,2,117),(179,2,121),(180,2,122),(181,2,125),(182,2,141),(183,2,142),(184,2,144),(2479,2,151),(2480,2,152),(2481,2,153),(2482,2,154),(185,2,161),(186,2,162),(187,2,163),(188,2,164),(189,2,165),(190,2,170),(2471,2,171),(192,2,172),(2472,2,173),(193,2,221),(194,2,222),(195,2,229),(196,2,241),(197,2,242),(198,2,243),(199,2,251),(201,2,262),(202,2,281),(203,2,282),(204,2,283),(205,2,331),(2483,2,531),(207,2,532),(2484,2,534),(208,2,536),(2473,2,700),(210,2,701),(211,2,702),(2474,2,703),(212,2,1001),(213,2,1002),(214,2,1003),(215,2,1004),(216,2,1005),(217,2,1101),(218,2,1102),(219,2,1104),(220,2,1109),(221,2,1181),(222,2,1182),(223,2,1183),(224,2,1184),(225,2,1185),(226,2,1186),(227,2,1187),(228,2,1188),(229,2,1201),(230,2,1202),(231,2,1231),(232,2,1232),(233,2,1233),(234,2,1234),(235,2,1421),(236,2,2401),(237,2,2402),(238,2,2403),(239,2,2411),(240,2,2412),(241,2,2413),(242,2,2500),(2470,2,2501),(243,2,2515),(10363,2,20001),(10364,2,20002),(10365,2,20003),(10366,2,20004),(10367,2,20005),(10368,2,20006),(10362,2,50101),(10372,2,101250),(1807,3,11),(1808,3,31),(1809,3,36),(1810,3,41),(1811,3,61),(1812,3,71),(1813,3,72),(1814,3,74),(1815,3,75),(1816,3,78),(1817,3,79),(1818,3,91),(1819,3,95),(1820,3,97),(1821,3,111),(1822,3,121),(1823,3,122),(1824,3,125),(1825,3,161),(1826,3,170),(1827,3,171),(1828,3,172),(1829,3,221),(1830,3,222),(1831,3,229),(1832,3,241),(1833,3,242),(1834,3,243),(1835,3,251),(1836,3,255),(1837,3,256),(1838,3,262),(1839,3,281),(1840,3,282),(1841,3,283),(1842,3,331),(1843,3,531),(1844,3,536),(1845,3,700),(1846,3,1001),(1847,3,1002),(1848,3,1003),(1849,3,1004),(1850,3,1005),(1851,3,1181),(1852,3,1182),(1853,3,1201),(1854,3,1202),(1855,3,1231),(1856,3,2401),(1857,3,2402),(1858,3,2403),(1859,3,2411),(1860,3,2412),(1861,3,2413),(1862,3,2500),(1863,3,2515),(8026,4,11),(8027,4,21),(8028,4,31),(8029,4,41),(8030,4,61),(8031,4,71),(8032,4,72),(8033,4,74),(8034,4,75),(8035,4,78),(8036,4,79),(8037,4,81),(8038,4,91),(8039,4,95),(8040,4,97),(8041,4,101),(8042,4,111),(8043,4,121),(8044,4,151),(8045,4,161),(8046,4,171),(8047,4,221),(8048,4,222),(8049,4,229),(8050,4,241),(8051,4,242),(8052,4,243),(8146,4,251),(8147,4,253),(8053,4,262),(8054,4,281),(8055,4,331),(8056,4,341),(8057,4,342),(8058,4,343),(8059,4,344),(8060,4,531),(8061,4,700),(8062,4,1001),(8063,4,1002),(8064,4,1003),(8065,4,1004),(8066,4,1005),(8067,4,1101),(8068,4,1181),(8069,4,1182),(8070,4,1201),(8071,4,1202),(8072,4,1231),(8073,4,2401),(8074,4,2501),(8075,4,2503),(8076,4,2515),(8077,4,20001),(8078,4,50101),(8079,4,101201),(8080,4,101261),(8081,4,102000),(8082,4,400051),(8083,4,400052),(8084,4,400053),(8085,4,400055),(8194,6,11),(8195,6,21),(8196,6,31),(8197,6,41),(8198,6,61),(8199,6,71),(8200,6,72),(8201,6,74),(8202,6,75),(8203,6,78),(8204,6,79),(8205,6,81),(8206,6,91),(8207,6,95),(8208,6,97),(8209,6,101),(8210,6,111),(8211,6,121),(8212,6,151),(8213,6,161),(8214,6,171),(8215,6,221),(8216,6,222),(8217,6,229),(8218,6,241),(8219,6,242),(8220,6,243),(8221,6,262),(8222,6,281),(8223,6,331),(8224,6,341),(8225,6,342),(8226,6,343),(8227,6,344),(8228,6,531),(8229,6,700),(8230,6,1001),(8231,6,1002),(8232,6,1003),(8233,6,1004),(8234,6,1005),(8235,6,1101),(8236,6,1181),(8237,6,1182),(8238,6,1201),(8239,6,1202),(8240,6,1231),(8241,6,1791),(8242,6,2401),(8243,6,2501),(8244,6,2503),(8245,6,2515),(8246,6,5001),(8247,6,20001),(8248,6,50101),(8249,6,101201),(8250,6,101261),(8251,6,102000),(8252,6,400051),(8253,6,400052),(8254,6,400053),(8255,6,400055),(8256,7,11),(8257,7,21),(8258,7,31),(8259,7,41),(8260,7,61),(8261,7,71),(8262,7,72),(8263,7,74),(8264,7,75),(8265,7,78),(8266,7,79),(8267,7,81),(8268,7,91),(8269,7,95),(8270,7,97),(8271,7,101),(8272,7,111),(8273,7,121),(8274,7,151),(8275,7,161),(8276,7,171),(8277,7,221),(8278,7,222),(8279,7,229),(8280,7,241),(8281,7,242),(8282,7,243),(8283,7,262),(8284,7,281),(8285,7,331),(8286,7,341),(8287,7,342),(8288,7,343),(8289,7,344),(8290,7,531),(8291,7,700),(8292,7,1001),(8293,7,1002),(8294,7,1003),(8295,7,1004),(8296,7,1005),(8297,7,1101),(8298,7,1181),(8299,7,1182),(8300,7,1201),(8301,7,1202),(8302,7,1231),(8303,7,1791),(8304,7,2401),(8305,7,2501),(8306,7,2503),(8307,7,2515),(8308,7,5001),(8309,7,20001),(8310,7,50101),(8311,7,101201),(8312,7,101261),(8313,7,102000),(8314,7,400051),(8315,7,400052),(8316,7,400053),(8317,7,400055),(8318,9,11),(8319,9,21),(8320,9,31),(8321,9,41),(8322,9,61),(8323,9,71),(8324,9,72),(8325,9,74),(8326,9,75),(8327,9,78),(8328,9,79),(8329,9,81),(8330,9,91),(8331,9,95),(8332,9,97),(8333,9,101),(8334,9,111),(8335,9,121),(8336,9,151),(8337,9,161),(8338,9,171),(8339,9,221),(8340,9,222),(8341,9,229),(8342,9,241),(8343,9,242),(8344,9,243),(8345,9,262),(8346,9,281),(8347,9,331),(8348,9,341),(8349,9,342),(8350,9,343),(8351,9,344),(8352,9,531),(8353,9,700),(8354,9,1001),(8355,9,1002),(8356,9,1003),(8357,9,1004),(8358,9,1005),(8359,9,1101),(8360,9,1181),(8361,9,1182),(8362,9,1201),(8363,9,1202),(8364,9,1231),(8365,9,1791),(8366,9,2401),(8367,9,2501),(8368,9,2503),(8369,9,2515),(8370,9,5001),(8371,9,20001),(8372,9,50101),(8373,9,101201),(8374,9,101261),(8375,9,102000),(8376,9,400051),(8377,9,400052),(8378,9,400053),(8379,9,400055),(12608,10,11),(12609,10,21),(12610,10,31),(12611,10,41),(12612,10,61),(12613,10,71),(12614,10,72),(12615,10,74),(12616,10,75),(12617,10,78),(12618,10,79),(12619,10,81),(12620,10,91),(12621,10,95),(12622,10,97),(12623,10,101),(12624,10,111),(12625,10,121),(12626,10,151),(12627,10,161),(12628,10,171),(12629,10,221),(12630,10,222),(12631,10,229),(12632,10,241),(12633,10,242),(12634,10,243),(12635,10,262),(12636,10,281),(12637,10,300),(12638,10,331),(12639,10,341),(12640,10,342),(12641,10,343),(12642,10,344),(12643,10,531),(12644,10,700),(12645,10,1001),(12646,10,1002),(12647,10,1003),(12648,10,1004),(12649,10,1005),(12650,10,1101),(12651,10,1181),(12652,10,1182),(12653,10,1201),(12654,10,1202),(12655,10,1231),(12656,10,2401),(12657,10,2501),(12658,10,2503),(12659,10,2515),(12660,10,20001),(12661,10,20002),(12662,10,23001),(12663,10,50101),(12664,11,11),(12665,11,21),(12666,11,31),(12667,11,41),(12668,11,61),(12669,11,71),(12670,11,72),(12671,11,74),(12672,11,75),(12673,11,78),(12674,11,79),(12675,11,81),(12676,11,91),(12677,11,95),(12678,11,97),(12679,11,101),(12680,11,111),(12681,11,121),(12682,11,151),(12683,11,161),(12684,11,171),(12685,11,221),(12686,11,222),(12687,11,229),(12688,11,241),(12689,11,242),(12690,11,243),(12691,11,262),(12692,11,281),(12693,11,300),(12694,11,331),(12695,11,341),(12696,11,342),(12697,11,343),(12698,11,344),(12699,11,531),(12700,11,700),(12701,11,1001),(12702,11,1002),(12703,11,1003),(12704,11,1004),(12705,11,1005),(12706,11,1101),(12707,11,1181),(12708,11,1182),(12709,11,1201),(12710,11,1202),(12711,11,1231),(12712,11,2401),(12713,11,2501),(12714,11,2503),(12715,11,2515),(12716,11,20001),(12717,11,20002),(12718,11,23001),(12719,11,50101),(13203,12,11),(13193,12,12),(13195,12,13),(13197,12,14),(13199,12,15),(13202,12,16),(13205,12,19),(12721,12,21),(12722,12,31),(12723,12,41),(12724,12,61),(12725,12,71),(12726,12,72),(12727,12,74),(12728,12,75),(12729,12,78),(12730,12,79),(13163,12,81),(13157,12,82),(13158,12,84),(13159,12,86),(13161,12,87),(13162,12,88),(13164,12,89),(12732,12,91),(12733,12,95),(12734,12,97),(12735,12,101),(12736,12,111),(13261,12,121),(13257,12,122),(13260,12,125),(13263,12,126),(12738,12,151),(12739,12,161),(13173,12,171),(13168,12,172),(13170,12,173),(13172,12,174),(13174,12,178),(12741,12,221),(12742,12,222),(12743,12,229),(12744,12,241),(12745,12,242),(12746,12,243),(13304,12,251),(13285,12,252),(13287,12,253),(13288,12,254),(13290,12,255),(13292,12,256),(13265,12,262),(13274,12,281),(13270,12,282),(13273,12,283),(13276,12,286),(13146,12,300),(13147,12,301),(12750,12,331),(13293,12,341),(13294,12,342),(13295,12,343),(13296,12,344),(13302,12,351),(13299,12,352),(13301,12,353),(13303,12,354),(13305,12,358),(13282,12,531),(13279,12,532),(13281,12,534),(13283,12,538),(13181,12,700),(13177,12,701),(13180,12,702),(13183,12,703),(12757,12,1001),(12758,12,1002),(12759,12,1003),(12760,12,1004),(12761,12,1005),(12762,12,1101),(13208,12,1181),(13231,12,1182),(13211,12,1183),(13212,12,1184),(13214,12,1185),(13216,12,1186),(13218,12,1187),(13221,12,1188),(13219,12,1189),(12765,12,1201),(12766,12,1202),(13229,12,1231),(13224,12,1232),(13225,12,1233),(13227,12,1234),(13228,12,1235),(13230,12,1236),(13232,12,1237),(13207,12,1321),(13165,12,1421),(13134,12,2401),(13133,12,2402),(13136,12,2403),(13142,12,2411),(13141,12,2412),(13144,12,2413),(13145,12,2414),(13187,12,2501),(13186,12,2503),(13188,12,2515),(13247,12,20001),(13237,12,20002),(13240,12,20003),(13243,12,20004),(13246,12,20005),(13249,12,20006),(13153,12,23001),(13150,12,23002),(13152,12,23003),(13154,12,23004),(12775,12,50101),(13251,12,55001),(13252,12,55002),(12776,13,11),(12777,13,21),(12778,13,31),(12779,13,41),(12780,13,61),(12781,13,71),(12782,13,72),(12783,13,74),(12784,13,75),(12785,13,78),(12786,13,79),(12787,13,81),(12788,13,91),(12789,13,95),(12790,13,97),(12791,13,101),(12792,13,111),(12793,13,121),(12794,13,151),(12795,13,161),(12796,13,171),(12797,13,221),(12798,13,222),(12799,13,229),(12800,13,241),(12801,13,242),(12802,13,243),(12803,13,262),(12804,13,281),(12805,13,300),(12806,13,331),(12807,13,341),(12808,13,342),(12809,13,343),(12810,13,344),(12811,13,531),(12812,13,700),(12813,13,1001),(12814,13,1002),(12815,13,1003),(12816,13,1004),(12817,13,1005),(12818,13,1101),(12819,13,1181),(12820,13,1182),(12821,13,1201),(12822,13,1202),(12823,13,1231),(12824,13,2401),(12825,13,2501),(12826,13,2503),(12827,13,2515),(12828,13,20001),(12829,13,20002),(12830,13,23001),(12831,13,50101),(12832,14,11),(12833,14,21),(12834,14,31),(12835,14,41),(12836,14,61),(12837,14,71),(12838,14,72),(12839,14,74),(12840,14,75),(12841,14,78),(12842,14,79),(12843,14,81),(12844,14,91),(12845,14,95),(12846,14,97),(12847,14,101),(12848,14,111),(12849,14,121),(12850,14,151),(12851,14,161),(12852,14,171),(12853,14,221),(12854,14,222),(12855,14,229),(12856,14,241),(12857,14,242),(12858,14,243),(12859,14,262),(12860,14,281),(12861,14,300),(12862,14,331),(12863,14,341),(12864,14,342),(12865,14,343),(12866,14,344),(12867,14,531),(12868,14,700),(12869,14,1001),(12870,14,1002),(12871,14,1003),(12872,14,1004),(12873,14,1005),(12874,14,1101),(12875,14,1181),(12876,14,1182),(12877,14,1201),(12878,14,1202),(12879,14,1231),(12880,14,2401),(12881,14,2501),(12882,14,2503),(12883,14,2515),(12884,14,20001),(12885,14,20002),(12886,14,23001),(12887,14,50101),(12944,16,11),(12945,16,21),(12946,16,31),(13056,16,41),(13057,16,42),(13058,16,44),(13059,16,45),(12948,16,61),(12949,16,71),(12950,16,72),(12951,16,74),(12952,16,75),(12953,16,78),(12954,16,79),(12955,16,81),(12956,16,91),(12957,16,95),(12958,16,97),(12959,16,101),(12960,16,111),(12961,16,121),(13060,16,141),(13061,16,142),(13062,16,144),(12962,16,151),(12963,16,161),(12964,16,171),(12965,16,221),(12966,16,222),(12967,16,229),(12968,16,241),(12969,16,242),(12970,16,243),(13128,16,251),(13064,16,262),(12972,16,281),(12973,16,300),(12974,16,331),(12975,16,341),(12976,16,342),(12977,16,343),(12978,16,344),(12979,16,531),(12980,16,700),(12981,16,1001),(12982,16,1002),(12983,16,1003),(12984,16,1004),(12985,16,1005),(12986,16,1101),(12987,16,1181),(12988,16,1182),(12989,16,1201),(12990,16,1202),(12991,16,1231),(12992,16,2401),(12993,16,2501),(12994,16,2503),(12995,16,2515),(12996,16,20001),(12997,16,20002),(12998,16,23001),(12999,16,50101),(13000,17,11),(13001,17,21),(13002,17,31),(13065,17,41),(13066,17,42),(13067,17,44),(13068,17,45),(13004,17,61),(13005,17,71),(13006,17,72),(13007,17,74),(13008,17,75),(13009,17,78),(13010,17,79),(13011,17,81),(13012,17,91),(13013,17,95),(13014,17,97),(13015,17,101),(13016,17,111),(13017,17,121),(13069,17,141),(13070,17,142),(13071,17,144),(13018,17,151),(13019,17,161),(13020,17,171),(13021,17,221),(13022,17,222),(13023,17,229),(13024,17,241),(13025,17,242),(13026,17,243),(13028,17,281),(13029,17,300),(13030,17,331),(13031,17,341),(13032,17,342),(13033,17,343),(13034,17,344),(13035,17,531),(13036,17,700),(13037,17,1001),(13038,17,1002),(13039,17,1003),(13040,17,1004),(13041,17,1005),(13042,17,1101),(13043,17,1181),(13044,17,1182),(13045,17,1201),(13046,17,1202),(13047,17,1231),(13048,17,2401),(13049,17,2501),(13050,17,2503),(13051,17,2515),(13052,17,20001),(13053,17,20002),(13054,17,23001),(13055,17,50101);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8442,7 +8442,7 @@ CREATE TABLE `llx_usergroup` (
   `note` text,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_usergroup_name` (`nom`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8451,7 +8451,7 @@ CREATE TABLE `llx_usergroup` (
 
 LOCK TABLES `llx_usergroup` WRITE;
 /*!40000 ALTER TABLE `llx_usergroup` DISABLE KEYS */;
-INSERT INTO `llx_usergroup` VALUES (1,'Sale representatives',1,'2013-01-16 20:48:08','2015-10-03 09:44:44','All sales representative users'),(2,'Management',1,'2015-10-03 11:46:25','2015-10-03 09:46:25',''),(3,'Scientists',1,'2015-10-03 11:46:46','2015-10-03 09:46:46','');
+INSERT INTO `llx_usergroup` VALUES (1,'Sale representatives',1,'2013-01-16 20:48:08','2015-10-03 09:44:44','All sales representative users'),(2,'Management',1,'2015-10-03 11:46:25','2015-10-03 09:46:25',''),(3,'Scientists',1,'2015-10-03 11:46:46','2015-10-03 09:46:46',''),(4,'Commercial',1,'2015-10-05 21:30:13','2015-10-05 19:30:13','');
 /*!40000 ALTER TABLE `llx_usergroup` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8495,7 +8495,7 @@ CREATE TABLE `llx_usergroup_rights` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `fk_usergroup` (`fk_usergroup`,`fk_id`),
   CONSTRAINT `fk_usergroup_rights_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=200 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8504,7 +8504,7 @@ CREATE TABLE `llx_usergroup_rights` (
 
 LOCK TABLES `llx_usergroup_rights` WRITE;
 /*!40000 ALTER TABLE `llx_usergroup_rights` DISABLE KEYS */;
-INSERT INTO `llx_usergroup_rights` VALUES (1,1,2401),(2,1,2402),(3,1,2403),(4,1,2411),(5,1,2412),(6,1,2413);
+INSERT INTO `llx_usergroup_rights` VALUES (1,1,2401),(2,1,2402),(3,1,2403),(4,1,2411),(5,1,2412),(6,1,2413),(78,2,11),(79,2,12),(80,2,13),(81,2,14),(82,2,15),(83,2,16),(84,2,19),(144,2,21),(145,2,22),(146,2,24),(147,2,25),(148,2,26),(149,2,27),(150,2,28),(133,2,31),(134,2,32),(135,2,34),(136,2,38),(137,2,41),(138,2,42),(139,2,44),(140,2,45),(86,2,61),(87,2,62),(88,2,64),(89,2,67),(90,2,68),(7,2,71),(8,2,72),(9,2,74),(10,2,75),(11,2,76),(12,2,78),(13,2,79),(32,2,81),(33,2,82),(34,2,84),(35,2,86),(36,2,87),(37,2,88),(38,2,89),(173,2,91),(174,2,92),(175,2,93),(176,2,94),(40,2,95),(41,2,96),(42,2,97),(43,2,98),(66,2,101),(67,2,102),(68,2,104),(69,2,105),(70,2,106),(71,2,109),(21,2,111),(22,2,112),(23,2,113),(24,2,114),(25,2,115),(26,2,116),(27,2,117),(164,2,121),(165,2,122),(166,2,125),(167,2,126),(141,2,141),(142,2,142),(143,2,144),(129,2,151),(130,2,152),(131,2,153),(132,2,154),(44,2,161),(45,2,162),(46,2,163),(47,2,164),(48,2,165),(49,2,167),(54,2,171),(55,2,172),(56,2,173),(57,2,174),(58,2,178),(120,2,221),(121,2,222),(122,2,223),(123,2,229),(124,2,237),(125,2,238),(126,2,239),(29,2,241),(30,2,242),(31,2,243),(182,2,251),(183,2,252),(184,2,253),(185,2,254),(186,2,255),(187,2,256),(168,2,262),(169,2,281),(170,2,282),(171,2,283),(172,2,286),(197,2,331),(198,2,332),(199,2,333),(188,2,341),(189,2,342),(190,2,343),(191,2,344),(192,2,351),(193,2,352),(194,2,353),(195,2,354),(196,2,358),(151,2,531),(152,2,532),(153,2,534),(154,2,538),(59,2,700),(60,2,701),(61,2,702),(62,2,703),(177,2,1001),(178,2,1002),(179,2,1003),(180,2,1004),(181,2,1005),(72,2,1101),(73,2,1102),(74,2,1104),(75,2,1109),(91,2,1181),(92,2,1182),(93,2,1183),(94,2,1184),(95,2,1185),(96,2,1186),(97,2,1187),(98,2,1188),(99,2,1189),(76,2,1201),(77,2,1202),(100,2,1231),(101,2,1232),(102,2,1233),(103,2,1234),(104,2,1235),(105,2,1236),(106,2,1237),(113,2,1251),(85,2,1321),(39,2,1421),(14,2,2401),(15,2,2402),(16,2,2403),(17,2,2411),(18,2,2412),(19,2,2413),(20,2,2414),(63,2,2501),(64,2,2503),(65,2,2515),(114,2,20001),(115,2,20002),(116,2,20003),(117,2,20004),(118,2,20005),(119,2,20006),(50,2,23001),(51,2,23002),(52,2,23003),(53,2,23004),(28,2,50101),(127,2,55001),(128,2,55002);
 /*!40000 ALTER TABLE `llx_usergroup_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8526,7 +8526,7 @@ CREATE TABLE `llx_usergroup_user` (
   KEY `fk_usergroup_user_fk_usergroup` (`fk_usergroup`),
   CONSTRAINT `fk_usergroup_user_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_usergroup_user_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8535,7 +8535,7 @@ CREATE TABLE `llx_usergroup_user` (
 
 LOCK TABLES `llx_usergroup_user` WRITE;
 /*!40000 ALTER TABLE `llx_usergroup_user` DISABLE KEYS */;
-INSERT INTO `llx_usergroup_user` VALUES (1,1,1,1),(2,1,1,3),(3,1,3,3);
+INSERT INTO `llx_usergroup_user` VALUES (2,1,1,3),(3,1,3,3),(4,1,11,2),(5,1,13,4),(6,1,16,1),(7,1,17,1);
 /*!40000 ALTER TABLE `llx_usergroup_user` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -8548,4 +8548,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2015-10-03 13:00:02
+-- Dump completed on 2015-11-04 16:19:25

From 09f3cd6f1d736edf090b7738f9b9e24d61b0f9ca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 16:43:24 +0100
Subject: [PATCH 126/216] Fix class cant be abstract

---
 htdocs/core/lib/admin.lib.php                 | 5 +++--
 htdocs/core/modules/DolibarrModules.class.php | 8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index d59e3c9a864..e7630756127 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -838,13 +838,14 @@ function unActivateModule($value, $requiredby=1)
     }
     else
     {
-        // TODO Replace this afte DolibarrModules is moved as abstract class with a try catch to show module is bugged
+        //print $dir.$modFile;
+    	// TODO Replace this after DolibarrModules is moved as abstract class with a try catch to show module we try to disable has not been found or could not be loaded
         $genericMod = new DolibarrModules($db);
         $genericMod->name=preg_replace('/^mod/i','',$modName);
         $genericMod->rights_class=strtolower(preg_replace('/^mod/i','',$modName));
         $genericMod->const_name='MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',$modName));
         dol_syslog("modules::unActivateModule Failed to find module file, we use generic function with name " . $modName);
-        $genericMod->_remove();
+        $genericMod->_remove(array());
     }
 
     // Desactivation des modules qui dependent de lui
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0de1c7ab4ab..4bf274d0249 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -32,7 +32,7 @@
  *
  * Parent class for module descriptor class files
  */
-abstract class DolibarrModules
+class DolibarrModules
 {
     /**
      * @var DoliDb Database handler
@@ -199,10 +199,14 @@ abstract class DolibarrModules
 	 *
 	 * @param DoliDB		$db      Database handler
 	 */
-	//public function __construct($db);
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 	// We should but can't set this as abstract because this will make dolibarr hang
 	// after migration due to old module not implementing. We must wait PHP is able to make
 	// a try catch on Fatal error to manage this correctly.
+	// We need constructor into function unActivateModule into admin.lib.php
 
     /**
      * Enables a module.

From a7795f25fc73bbdd7aaa3766d722ed6f363bd9ee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 4 Nov 2015 17:51:15 +0100
Subject: [PATCH 127/216] Fix Must make a difference between a buying/cost
 price == '' (not provided) and buying/cost price = '0'. We must use default
 value only if value is '' and not if forced to '0'.

---
 htdocs/comm/askpricesupplier/card.php         |  2 +-
 htdocs/comm/propal.php                        |  8 ++++----
 htdocs/comm/propal/class/propal.class.php     | 14 ++++++++------
 htdocs/commande/card.php                      | 10 +++++-----
 htdocs/commande/class/commande.class.php      |  9 ++++++---
 htdocs/compta/facture.php                     |  6 +++---
 htdocs/compta/facture/class/facture.class.php | 16 +++++++++-------
 7 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php
index d59922c1cb4..389905c3d94 100644
--- a/htdocs/comm/askpricesupplier/card.php
+++ b/htdocs/comm/askpricesupplier/card.php
@@ -743,7 +743,7 @@ if (empty($reshook))
 
 		// Add buying price
 		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = (GETPOST('buying_price') ? GETPOST('buying_price') : '');
+		$buyingprice = (GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value 
 
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 08d4e31ec6b..408d01d8eaa 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -859,8 +859,8 @@ if (empty($reshook))
 			}
 
 			// Margin
-			$fournprice = (GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-			$buyingprice = (GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
+			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we muste keep this value
 
 			$date_start = dol_mktime(0, 0, 0, GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
 			$date_end = dol_mktime(0, 0, 0, GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
@@ -954,8 +954,8 @@ if (empty($reshook))
 		$pu_ht = GETPOST('price_ht');
 
 		// Add buying price
-		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = (GETPOST('buying_price') ? GETPOST('buying_price') : '');
+		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value 
 
 		$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8d4c91f097d..8710c76a72a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -400,7 +400,7 @@ class Propal extends CommonObject
         $txtva=price2num($txtva);
         $txlocaltax1=price2num($txlocaltax1);
         $txlocaltax2=price2num($txlocaltax2);
-    		$pa_ht=price2num($pa_ht);
+    	$pa_ht=price2num($pa_ht);
         if ($price_base_type=='HT')
         {
             $pu=$pu_ht;
@@ -3086,6 +3086,8 @@ class PropaleLigne  extends CommonObjectLine
 
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
+        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+        
         // Clean parameters
         if (empty($this->tva_tx)) $this->tva_tx=0;
         if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
@@ -3102,11 +3104,10 @@ class PropaleLigne  extends CommonObjectLine
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
 		if (! is_numeric($this->qty)) $this->qty = 0;
-
         if (empty($this->pa_ht)) $this->pa_ht=0;
 
        // if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -3254,7 +3255,7 @@ class PropaleLigne  extends CommonObjectLine
     /**
      *	Update propal line object into DB
      *
-     *	@param 	int		$notrigger	1=Does not execute triggers, 0= execuete triggers
+     *	@param 	int		$notrigger	1=Does not execute triggers, 0= execute triggers
      *	@return	int					<0 if ko, >0 if ok
      */
     function update($notrigger=0)
@@ -3263,6 +3264,8 @@ class PropaleLigne  extends CommonObjectLine
 
         $error=0;
 
+        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+        
         // Clean parameters
         if (empty($this->tva_tx)) $this->tva_tx=0;
         if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
@@ -3281,11 +3284,10 @@ class PropaleLigne  extends CommonObjectLine
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
         if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
         if (empty($this->subprice)) $this->subprice=0;
-
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 4d7456af1fd..dfb3b0919d6 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -733,8 +733,8 @@ if (empty($reshook))
 			}
 
 			// Margin
-			$fournprice = (GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-			$buyingprice = (GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
+			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we muste keep this value
 
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
@@ -833,9 +833,9 @@ if (empty($reshook))
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 
 		// Add buying price
-		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = (GETPOST('buying_price') ? GETPOST('buying_price') : '');
-
+		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value 
+		
 		// Extrafields Lines
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 92ca2600c8a..943b1480ace 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3507,6 +3507,8 @@ class OrderLine extends CommonOrderLine
 
 		$error=0;
 
+        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
@@ -3523,11 +3525,10 @@ class OrderLine extends CommonOrderLine
         if (empty($this->info_bits)) $this->info_bits=0;
         if (empty($this->special_code)) $this->special_code=0;
         if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
-
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -3641,6 +3642,8 @@ class OrderLine extends CommonOrderLine
 
 		$error=0;
 
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		
 		// Clean parameters
 		if (empty($this->tva_tx)) $this->tva_tx=0;
 		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
@@ -3661,7 +3664,7 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 385511338e1..de90cc068ea 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1400,7 +1400,7 @@ if (empty($reshook))
 
 			// Margin
 			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
-			$buyingprice = price2num(GETPOST('buying_price' . $predef) ? GETPOST('buying_price' . $predef) : '');
+			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : '');    // If buying_price is '0', we muste keep this value
 
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
@@ -1507,8 +1507,8 @@ if (empty($reshook))
 
 		// Add buying price
 		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = price2num(GETPOST('buying_price') ? GETPOST('buying_price') : '');
-
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');       // If buying_price is '0', we muste keep this value
+		
 		// Extrafields
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index bc286cd2a59..1462bf43a9b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3852,7 +3852,9 @@ class FactureLigne extends CommonInvoiceLine
 
 		$error=0;
 
-		dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
+        $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		
+        dol_syslog(get_class($this)."::insert rang=".$this->rang, LOG_DEBUG);
 
 		// Clean parameters
 		$this->desc=trim($this->desc);
@@ -3871,11 +3873,10 @@ class FactureLigne extends CommonInvoiceLine
 		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
 		if (empty($this->fk_prev_id)) $this->fk_prev_id = 'null';
 		if (empty($this->situation_percent)) $this->situation_percent = 0;
-
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -4050,6 +4051,8 @@ class FactureLigne extends CommonInvoiceLine
 
 		$error=0;
 
+		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
+		
 		// Clean parameters
 		$this->desc=trim($this->desc);
 		if (empty($this->tva_tx)) $this->tva_tx=0;
@@ -4065,14 +4068,13 @@ class FactureLigne extends CommonInvoiceLine
 		if (empty($this->product_type)) $this->product_type=0;
 		if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
 		if (is_null($this->situation_percent)) $this->situation_percent=100;
-
+		if (empty($this->pa_ht)) $this->pa_ht=0;
+		
 		// Check parameters
 		if ($this->product_type < 0) return -1;
 
-		if (empty($this->pa_ht)) $this->pa_ht=0;
-
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{

From 23a5c303ddbb6744c5d39d3d3a7dfa2d804300f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Wed, 4 Nov 2015 19:56:12 +0100
Subject: [PATCH 128/216] Fix #3870 Missing translation

---
 htdocs/comm/recap-client.php | 2 +-
 htdocs/contrat/card.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index ec54e553bdb..405ca2d4a11 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -64,7 +64,7 @@ if ($socid > 0)
     print '<table class="border" width="100%">';
 
     // Name
-    print '<tr><td width="20%">'.$langs->trans("Thirdparty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
+    print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
     // Prefix
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index fbf998ce012..0bce12b2918 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1042,7 +1042,7 @@ if ($action == 'create')
 
     // Thirdparty
 	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans('Thirdparty').'</td>';
+	print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 	if ($socid>0)
 	{
 		print '<td colspan="2">';

From ece9f68e0cc2afee45a7e925403eea4a8b3334ab Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Wed, 4 Nov 2015 18:57:12 +0100
Subject: [PATCH 129/216] wip

---
 htdocs/admin/receiptprinter.php               | 121 ++++++------------
 htdocs/core/class/dolreceiptprinter.class.php | 102 ++++++++++++++-
 2 files changed, 141 insertions(+), 82 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index adba566eabb..fe20da1bef9 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -36,16 +36,20 @@ if (! $user->admin) accessforbidden();
 
 $action = GETPOST('action','alpha');
 $mode = GETPOST('mode','alpha');
-$value = GETPOST('value','alpha');
-$varname = GETPOST('varname', 'alpha');
+
 $printername = GETPOST('printername', 'alpha');
 $printerid = GETPOST('printerid', 'int');
 $parameter = GETPOST('parameter', 'alpha');
 
+$template = GETPOST('template', 'alpha');
+$templatename = GETPOST('templatename', 'alpha');
+$templateid = GETPOST('templateid', 'int');
+
 $printer = new dolReceiptPrinter($db);
 
 if (!$mode) $mode='config';
 
+// used in library escpos maybe useful if php doesn't support gzdecode
 if (!function_exists('gzdecode')) {
     function gzdecode($data)
     {
@@ -170,6 +174,35 @@ if ($action == 'testprinter' && $user->admin)
 }
 
 
+if ($action == 'updatetemplate' && $user->admin)
+{
+    $error=0;
+    $db->begin();
+    if (empty($templateid)) {
+        $error++;
+        setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
+    }
+
+    if (! $error)
+    {
+        $result= $printer->UpdateTemplate($templatename, $template, $templateid);
+        if ($result > 0) $error++;
+
+        if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("TemplateUpdated",$templatename), null);
+        }
+        else
+        {
+            $db->rollback();
+            dol_print_error($db);
+        }
+    }
+    $action = '';
+}
+
+
 /*
  * View
  */
@@ -309,76 +342,6 @@ if ($mode == 'config' && $user->admin)
 
 if ($mode == 'template' && $user->admin)
 {
-     $tags = array(
-        'dol_align_left',
-        'dol_align_center',
-        'dol_align_right',
-        'dol_use_font_a',
-        'dol_use_font_b',
-        'dol_use_font_c',
-        'dol_bold',
-        '/dol_bold',
-        'dol_double_height',
-        '/dol_double_height',
-        'dol_double_width',
-        '/dol_double_width',
-        'dol_underline',
-        '/dol_underline',
-        'dol_underline_2dots',
-        '/dol_underline',
-        'dol_emphasized',
-        '/dol_emphasized',
-        'dol_switch_colors',
-        '/dol_switch_colors',
-        'dol_print_barcode',
-        'dol_print_barcode_customer_id',
-        'dol_set_print_width_57',
-        'dol_cut_paper_full',
-        'dol_cut_paper_partial',
-        'dol_open_drawer',
-        'dol_activate_buzzer',
-        'dol_print_qrcode',
-        'dol_print_date',
-        'dol_print_date_time',
-        'dol_print_year',
-        'dol_print_month_letters',
-        'dol_print_month',
-        'dol_print_day',
-        'dol_print_day_letters',
-        'dol_print_table',
-        'dol_print_cutlery',
-        'dol_print_payment',
-        'dol_print_logo',
-        'dol_print_logo_old',
-        'dol_print_order_lines',
-        'dol_print_order_tax',
-        'dol_print_order_local_tax',
-        'dol_print_order_total',
-        'dol_print_order_number',
-        'dol_print_order_number_unique',
-        'dol_print_customer_first_name',
-        'dol_print_customer_last_name',
-        'dol_print_customer_mail',
-        'dol_print_customer_telephone',
-        'dol_print_customer_mobile',
-        'dol_print_customer_skype',
-        'dol_print_customer_tax_number',
-        'dol_print_customer_account_balance',
-        'dol_print_vendor_last_name',
-        'dol_print_vendor_first_name',
-        'dol_print_vendor_mail',
-        'dol_print_customer_points',
-        'dol_print_order_points',
-        'dol_print_if_customer',
-        'dol_print_if_vendor',
-        'dol_print_if_happy_hour',
-        'dol_print_if_num_order_unique',
-        'dol_print_if_customer_points',
-        'dol_print_if_order_points',
-        'dol_print_if_customer_tax_number',
-        'dol_print_if_customer_account_balance_positive',
-    );
-
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     if ($action!='edittemplate') {
@@ -410,9 +373,9 @@ if ($mode == 'template' && $user->admin)
             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>';
-                // TODO doleditor
-                print '<td><input size="120" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['template'].'"></td>';
-                print '<td></td>';
+                print '<td><textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
+                print '</td>';
+                //print '<td></td>';
                 print '<td></td>';
                 print '<td></td>';
             } else {
@@ -423,11 +386,11 @@ if ($mode == 'template' && $user->admin)
                 print img_picto($langs->trans("Edit"),'edit');
                 print '</a></td>';
                 // delete icon
-                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
                 print img_picto($langs->trans("Delete"),'delete');
                 print '</a></td>';
                 // test icon
-                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+                print '<td><a href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
                 print img_picto($langs->trans("TestPrinterTemplate"),'printer');
                 print '</a></td>';
             }
@@ -449,10 +412,10 @@ if ($mode == 'template' && $user->admin)
     print '<th>'.$langs->trans("Tag").'</th>';
     print '<th>'.$langs->trans("Description").'</th>';
     print "</tr>\n";
-    for ($tag=0; $tag < count($tags); $tag++) {
+    for ($tag=0; $tag < count($printer->tags); $tag++) {
         $var = !$var;
         print '<tr '.$bc[$var].'>';
-        print '<td>&lt;'.$tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($tags[$tag])).'</td>';
+        print '<td>&lt;'.$printer->tags[$tag].'&gt;</td><td>'.$langs->trans(strtoupper($printer->tags[$tag])).'</td>';
         print '</tr>';
     }
     print '</table>';
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 57f8691f6e7..7a3f5ce4375 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -106,6 +106,7 @@ class dolReceiptPrinter extends Escpos
     const CONNECTOR_WINDOWS_PRINT = 4;
     //const CONNECTOR_JAVA = 5;
     var $db;
+    var $tags;
     var $error;
     var $errors;
 
@@ -119,6 +120,76 @@ class dolReceiptPrinter extends Escpos
     function __construct($db)
     {
         $this->db=$db;
+        $this->tags = array(
+            'dol_align_left',
+            'dol_align_center',
+            'dol_align_right',
+            'dol_use_font_a',
+            'dol_use_font_b',
+            'dol_use_font_c',
+            'dol_bold',
+            '/dol_bold',
+            'dol_double_height',
+            '/dol_double_height',
+            'dol_double_width',
+            '/dol_double_width',
+            'dol_underline',
+            '/dol_underline',
+            'dol_underline_2dots',
+            '/dol_underline',
+            'dol_emphasized',
+            '/dol_emphasized',
+            'dol_switch_colors',
+            '/dol_switch_colors',
+            'dol_print_barcode',
+            'dol_print_barcode_customer_id',
+            'dol_set_print_width_57',
+            'dol_cut_paper_full',
+            'dol_cut_paper_partial',
+            'dol_open_drawer',
+            'dol_activate_buzzer',
+            'dol_print_qrcode',
+            'dol_print_date',
+            'dol_print_date_time',
+            'dol_print_year',
+            'dol_print_month_letters',
+            'dol_print_month',
+            'dol_print_day',
+            'dol_print_day_letters',
+            'dol_print_table',
+            'dol_print_cutlery',
+            'dol_print_payment',
+            'dol_print_logo',
+            'dol_print_logo_old',
+            'dol_print_order_lines',
+            'dol_print_order_tax',
+            'dol_print_order_local_tax',
+            'dol_print_order_total',
+            'dol_print_order_number',
+            'dol_print_order_number_unique',
+            'dol_print_customer_first_name',
+            'dol_print_customer_last_name',
+            'dol_print_customer_mail',
+            'dol_print_customer_telephone',
+            'dol_print_customer_mobile',
+            'dol_print_customer_skype',
+            'dol_print_customer_tax_number',
+            'dol_print_customer_account_balance',
+            'dol_print_vendor_last_name',
+            'dol_print_vendor_first_name',
+            'dol_print_vendor_mail',
+            'dol_print_customer_points',
+            'dol_print_order_points',
+            'dol_print_if_customer',
+            'dol_print_if_vendor',
+            'dol_print_if_happy_hour',
+            'dol_print_if_num_order_unique',
+            'dol_print_if_customer_points',
+            'dol_print_if_order_points',
+            'dol_print_if_customer_tax_number',
+            'dol_print_if_customer_account_balance_positive',
+        );
+
     }
 
     /**
@@ -216,7 +287,7 @@ class dolReceiptPrinter extends Escpos
         $error = 0;
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
         $sql.= ' (name, fk_type, parameter, entity)';
-        $sql.= ' VALUES ("'.$name.'", '.$type.', "'.$parameter.'", '.$conf->entity.')';
+        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
         $resql = $this->db->query($sql);
         if (! $resql) {
             $error++;
@@ -239,9 +310,9 @@ class dolReceiptPrinter extends Escpos
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$name.'"';
+        $sql.= ' SET name="'.$this->db->escape($name).'"';
         $sql.= ', fk_type='.$type;
-        $sql.= ', parameter="'.$parameter.'"';
+        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
         $sql.= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
         if (! $resql) {
@@ -271,6 +342,31 @@ class dolReceiptPrinter extends Escpos
         return $error;
     }
 
+    /**
+     *  Function to Update a printer template in db
+     *
+     *  @param    string    $name           Template name
+     *  @param    int       $template       Template
+     *  @param    int       $templateid     Template id
+     *  @return   int                       0 if OK; >0 if KO
+     */
+    function UpdateTemplate($name, $template, $templateid)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql.= ' SET name="'.$this->db->escape($name).'"';
+        $sql.= ', template="'.$this->db->escape($template).'"';
+        $sql.= ' WHERE rowid='.$templateid;
+        $resql = $this->db->query($sql);
+        if (! $resql) {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        return $error;
+    }
+
+
     /**
      *  Function to Send Test page to Printer
      *

From eba0fa1b96bb0031dfeec425198ad39a5b20d3fa Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Wed, 4 Nov 2015 22:38:45 +0100
Subject: [PATCH 130/216] When you create an "commande" from a "propal" lost
 $object->origin and $object->origin_id in hook

---
 htdocs/commande/card.php                 | 18 +++++++++---------
 htdocs/commande/class/commande.class.php | 16 +++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index dfb3b0919d6..f16a29c2412 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -354,7 +354,7 @@ if (empty($reshook))
 									$array_options = $lines[$i]->array_options;
 								}
 
-								$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, $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);
+								$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, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code,$object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit);
 
 								if ($result < 0) {
 									$error++;
@@ -834,8 +834,8 @@ if (empty($reshook))
 
 		// Add buying price
 		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
-		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value 
-		
+		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : '');    // If buying_price is '0', we muste keep this value
+
 		// Extrafields Lines
 		$extrafieldsline = new ExtraFields($db);
 		$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
@@ -1166,9 +1166,9 @@ if (empty($reshook))
 
 
 
-	if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer) 
+	if (! $error && ! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->commande->creer)
 	{
-		if ($action == 'addcontact') 
+		if ($action == 'addcontact')
 		{
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
@@ -1189,7 +1189,7 @@ if (empty($reshook))
 		}
 
 		// bascule du statut d'un contact
-		else if ($action == 'swapstatut') 
+		else if ($action == 'swapstatut')
 		{
 			if ($object->id > 0) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
@@ -1199,7 +1199,7 @@ if (empty($reshook))
 		}
 
 		// Efface un contact
-		else if ($action == 'deletecontact') 
+		else if ($action == 'deletecontact')
 		{
 			$result = $object->delete_contact($lineid);
 
@@ -1433,7 +1433,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 	print '</td></tr>';
 
 	// TODO How record was recorded OrderMode (llx_c_input_method)
-	
+
 	// Project
 	if (! empty($conf->projet->enabled) && $socid > 0)
 	{
@@ -1996,7 +1996,7 @@ if ($action == 'create' && $user->rights->commande->creer)
 		print '</td></tr>';
 
     	// TODO How record was recorded OrderMode (llx_c_input_method)
-		
+
 		// Project
 		if (! empty($conf->projet->enabled))
 		{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 943b1480ace..5534e75a478 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -953,7 +953,7 @@ class Commande extends CommonOrder
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_client         = '';
-		
+
         // Create clone
         $result=$this->create($user);
         if ($result < 0) $error++;
@@ -1005,7 +1005,7 @@ class Commande extends CommonOrder
 
         $error=0;
 
-        
+
         $this->date_commande = dol_now();
         $this->source = 0;
 
@@ -1150,7 +1150,7 @@ class Commande extends CommonOrder
      *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
      *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null)
     {
     	global $mysoc, $conf, $langs;
 
@@ -1269,6 +1269,8 @@ class Commande extends CommonOrder
             $this->line->total_ttc=$total_ttc;
             $this->line->product_type=$type;
             $this->line->special_code=$special_code;
+            $this->line->origin=$origin;
+            $this->line->origin_id=$origin_id;
             $this->line->fk_parent_line=$fk_parent_line;
 	        $this->line->fk_unit=$fk_unit;
 
@@ -3508,7 +3510,7 @@ class OrderLine extends CommonOrderLine
 		$error=0;
 
         $pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
-		
+
         dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
         // Clean parameters
@@ -3528,7 +3530,7 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{
@@ -3643,7 +3645,7 @@ class OrderLine extends CommonOrderLine
 		$error=0;
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
-		
+
 		// Clean parameters
 		if (empty($this->tva_tx)) $this->tva_tx=0;
 		if (empty($this->localtax1_tx)) $this->localtax1_tx=0;
@@ -3664,7 +3666,7 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->pa_ht)) $this->pa_ht=0;
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring) 
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
 		{
 			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
 			{

From 69ac75bef8570112e0ce94e03b2f70805042e35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Wed, 4 Nov 2015 22:55:14 +0100
Subject: [PATCH 131/216] Fix #3864 Fixed invalid jQuery code

---
 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 a8c9434acec..190fad96c51 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -446,7 +446,7 @@ jQuery(document).ready(function() {
 		<?php if (! empty($usemargins) && $user->rights->margins->creer) { ?>
 
 		/* Code for margin */
-  		$("#fournprice_predef options").remove();
+  		$("#fournprice_predef option").each.remove();
 		$("#fournprice_predef").hide();
 		$("#buying_price").val("").show();
   		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', { 'idprod': $(this).val() }, function(data) {

From 644a104d5f905e926faa156d8a2a784e8b745306 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Wed, 4 Nov 2015 23:09:39 +0100
Subject: [PATCH 132/216] start to parse template

---
 htdocs/admin/receiptprinter.php               |  13 +-
 htdocs/core/class/dolreceiptprinter.class.php | 247 ++++++++++++++----
 .../core/modules/modReceiptPrinter.class.php  |   2 +-
 htdocs/langs/en_US/receiptprinter.lang        |  10 +-
 4 files changed, 209 insertions(+), 63 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index fe20da1bef9..8e3c7388adf 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -375,7 +375,7 @@ if ($mode == 'template' && $user->admin)
                 print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
                 print '<td><textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
                 print '</td>';
-                //print '<td></td>';
+                print '<td></td>';
                 print '<td></td>';
                 print '<td></td>';
             } else {
@@ -424,6 +424,17 @@ if ($mode == 'template' && $user->admin)
 
 }
 
+// to remove after test
+$object->date = '2015-11-02 22:30:25';
+$object->id = 1234;
+$object->customer_firstname  = 'John';
+$object->customer_lastname  = 'Deuf';
+$object->vendor_firstname  = 'Jim';
+$object->vendor_lastname  = 'Big';
+
+$object->barcode = '3700123862396';
+//$printer->sendToPrinter($object, 1, 16);
+//setEventMessages($printer->error, $printer->errors, 'errors');
 
 llxFooter();
 
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 7a3f5ce4375..5271950706a 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -66,10 +66,10 @@
  * <dol_print_order_total>                          Print order total
  * <dol_print_order_number>                         Print order number
  * <dol_print_order_number_unique>                  Print order number after validation
- * <dol_print_customer_first_name>                  Print customer firstname
- * <dol_print_customer_last_name>                   Print customer name
+ * <dol_print_customer_firstname>                   Print customer firstname
+ * <dol_print_customer_lastname>                    Print customer name
  * <dol_print_customer_mail>                        Print customer mail
- * <dol_print_customer_telephone>                   Print customer phone
+ * <dol_print_customer_phone>                       Print customer phone
  * <dol_print_customer_mobile>                      Print customer mobile
  * <dol_print_customer_skype>                       Print customer skype
  * <dol_print_customer_tax_number>                  Print customer VAT number
@@ -107,6 +107,8 @@ class dolReceiptPrinter extends Escpos
     //const CONNECTOR_JAVA = 5;
     var $db;
     var $tags;
+    var $printer;
+    var $template;
     var $error;
     var $errors;
 
@@ -167,16 +169,16 @@ class dolReceiptPrinter extends Escpos
             'dol_print_order_total',
             'dol_print_order_number',
             'dol_print_order_number_unique',
-            'dol_print_customer_first_name',
-            'dol_print_customer_last_name',
+            'dol_print_customer_firstname',
+            'dol_print_customer_lastname',
             'dol_print_customer_mail',
-            'dol_print_customer_telephone',
+            'dol_print_customer_phone',
             'dol_print_customer_mobile',
             'dol_print_customer_skype',
             'dol_print_customer_tax_number',
             'dol_print_customer_account_balance',
-            'dol_print_vendor_last_name',
-            'dol_print_vendor_first_name',
+            'dol_print_vendor_lastname',
+            'dol_print_vendor_firstname',
             'dol_print_vendor_mail',
             'dol_print_customer_points',
             'dol_print_order_points',
@@ -377,54 +379,22 @@ class dolReceiptPrinter extends Escpos
     {
         global $conf;
         $error = 0;
-        $sql = 'SELECT rowid, name, fk_type, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
+        $img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
+        $ret = $this->InitPrinter($printerid);
+        if ($ret>0) {
+            setEventMessages($this->error, $this->errors, 'errors');
         } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        //print '<pre>'.print_r($obj, true).'</pre>';
-        if (! $error) {
-            $parameter = $obj['parameter'];
             try {
-                switch ($obj['fk_type']) {
-                    case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/escpos/src/DummyPrintConnector.php';
-                        $connector = new DummyPrintConnector();
-                        break;
-                    case 2:
-                        $connector = new FilePrintConnector($parameter);
-                        break;
-                    case 3:
-                        $parameters = explode(':', $parameter);
-                        $connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
-                        break;
-                    case 4:
-                        $connector = new WindowsPrintConnector($parameter);
-                        break;
-                    default:
-                        $connector = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                $testprinter = new Escpos($connector);
-                $img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
-                $testprinter -> graphics($img);
-                $testprinter -> text("Hello World!\n");
+                $this->printer->graphics($img);
+                $this->printer->text("Hello World!\n");
                 $testStr = "Testing 123";
-                $testprinter -> qrCode($testStr);
-                $testprinter -> text("Most simple example\n");
-                $testprinter -> feed();
-                $testprinter -> cut();
-                //print '<pre>'.print_r($connector, true).'</pre>';
-                $testprinter -> close();
+                $this->printer->qrCode($testStr);
+                $this->printer->text("Most simple example\n");
+                $this->printer->feed();
+                $this->printer->cut();
+                //print '<pre>'.print_r($this->connector, true).'</pre>';
+                $this->printer->close();
 
-                //print '<pre>'.print_r($connector, true).'</pre>';
-                //print '<pre>'.print_r($testprinter, true).'</pre>';
             } catch (Exception $e) {
                 $this->errors[] = $e->getMessage();
                 $error++;
@@ -437,21 +407,186 @@ class dolReceiptPrinter extends Escpos
      *  Function to Print Receipt Ticket
      *
      *  @param   object    $object          order or invoice object
-     *  @param   int       $template        Template id
+     *  @param   int       $templateid      Template id
      *  @param   int       $printerid       Printer id
      *  @return  int                        0 if OK; >0 if KO
      */
-    function SendToPrinter($object, $template, $printerid)
+    function SendToPrinter($object, $templateid, $printerid)
     {
         global $conf;
         $error = 0;
+        $ret = $this->loadTemplate($templateid);
+
+        // tags a remplacer par leur valeur avant de parser
+        $this->template = str_replace('<dol_print_num_order>', $object->id, $this->template);
+        $this->template = str_replace('<dol_print_customer_firstname>', $object->customer_firstname, $this->template);
+        $this->template = str_replace('<dol_print_customer_lastname>', $object->customer_lastname, $this->template);
+        $this->template = str_replace('<dol_print_customer_mail>', $object->customer_mail, $this->template);
+        $this->template = str_replace('<dol_print_customer_phone>', $object->customer_phone, $this->template);
+        $this->template = str_replace('<dol_print_customer_mobile>', $object->customer_mobile, $this->template);
+        $this->template = str_replace('<dol_print_customer_skype>', $object->customer_skype, $this->template);
+        $this->template = str_replace('<dol_print_customer_tax_number>', $object->customer_tax_number, $this->template);
+        $this->template = str_replace('<dol_print_customer_account_balance>', $object->customer_account_balance, $this->template);
+        $this->template = str_replace('<dol_print_vendor_firstname>', $object->vendor_firstname, $this->template);
+        $this->template = str_replace('<dol_print_vendor_lastname>', $object->vendor_lastname, $this->template);
 
         // parse template
-
-
+        $p = xml_parser_create();
+        xml_parse_into_struct($p, $this->template, $vals, $index);
+        xml_parser_free($p);
+        //print '<pre>'.print_r($index, true).'</pre>';
+        //print '<pre>'.print_r($vals, true).'</pre>';
         // print ticket
+        $level = 0;
+        $ret = $this->InitPrinter($printerid);
+        if ($ret>0) {
+            setEventMessages($this->error, $this->errors, 'errors');
+        } else {
+            for ($line=0; $line < count($vals); $line++) {
+                switch ($vals[$line]['tag']) {
+                    case 'DOL_ALIGN_CENTER':
+                        $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
+                        $this->printer->text($vals[$line]['value']);
+                        break;
+                    case 'DOL_ALIGN_RIGHT':
+                        $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
+                        break;
+                    case 'DOL_ALIGN_LEFT':
+                        $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
+                        break;
+                    case 'DOL_OPEN_DRAWER':
+                        $this->printer->pulse();
+                        break;
+                    case 'DOL_PRINT_BARCODE':
+                        // $vals[$line]['value'] -> barcode($content, $type)
+                        $this->printer->barcode($object->barcode);
+                        break;
+                    case 'DOL_PRINT_DATE_TIME':
+                        $this->printer->text($object->date);
+                        break;
+                    case 'DOL_PRINT_QRCODE':
+                        // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
+                        $this->printer->qrcode($vals[$line]['value']);
+                        break;
+                    case 'DOL_CUT_PAPER_FULL':
+                        $this->printer->cut(Escpos::CUT_FULL);
+                        break;
+                    case 'DOL_CUT_PAPER_PARTIAL':
+                        $this->printer->cut(Escpos::CUT_PARTIAL);
+                        break;
+                    case 'DOL_USE_FONT_A':
+                        $this->printer->setFont(Escpos::FONT_A);
+                        $this->printer->text($vals[$line]['value']);
+                        break;
+                    case 'DOL_USE_FONT_B':
+                        $this->printer->setFont(Escpos::FONT_B);
+                        $this->printer->text($vals[$line]['value']);
+                        break;
+                    case 'DOL_USE_FONT_C':
+                        $this->printer->setFont(Escpos::FONT_C);
+                        $this->printer->text($vals[$line]['value']);
+                        break;
+                    default:
+                        $this->printer->text($vals[$line]['value']);
+                        $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
+                        $error++;
+                        break;
+                }
+            }
+            // Close and print
+            // uncomment next line to see content sent to printer
+            //print '<pre>'.print_r($this->connector, true).'</pre>';
+            $this->printer->close();
+
+        }
+        return $error;
+    }
+
+    /**
+     *  Function to load Template
+     *
+     *  @param   int       $templateid        Template id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function loadTemplate($templateid)
+    {
+        global $conf;
+        $error = 0;
+        $sql = 'SELECT template';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql.= ' WHERE rowid='.$templateid;
+        $sql.= ' AND entity = '.$conf->entity;
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $obj = $this->db->fetch_array($resql);
+        } else {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        if (empty($obj)) {
+            $error++;
+            $this->errors[] = 'TemplateDontExist';
+        } else {
+            $this->template = $obj['0'];
+        }
 
         return $error;
     }
 
+
+    /**
+     *  Function Init Printer
+     *
+     *  @param   int       $printerid       Printer id
+     *  @return  int                        0 if OK; >0 if KO
+     */
+    function InitPrinter($printerid)
+    {
+        global $conf;
+        $error=0;
+        $sql = 'SELECT rowid, name, fk_type, parameter';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql.= ' WHERE rowid = '.$printerid;
+        $sql.= ' AND entity = '.$conf->entity;
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $obj = $this->db->fetch_array($resql);
+        } else {
+            $error++;
+            $this->errors[] = $this->db->lasterror;
+        }
+        if (empty($obj)) {
+            $error++;
+            $this->errors[] = 'PrinterDontExist';
+        }
+        if (! $error) {
+            $parameter = $obj['parameter'];
+            try {
+                switch ($obj['fk_type']) {
+                    case 1:
+                        require_once DOL_DOCUMENT_ROOT .'/includes/escpos/src/DummyPrintConnector.php';
+                        $this->connector = new DummyPrintConnector();
+                        break;
+                    case 2:
+                        $this->connector = new FilePrintConnector($parameter);
+                        break;
+                    case 3:
+                        $parameters = explode(':', $parameter);
+                        $this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+                        break;
+                    case 4:
+                        $this->connector = new WindowsPrintConnector($parameter);
+                        break;
+                    default:
+                        $this->connector = 'CONNECTOR_UNKNOWN';
+                        break;
+                }
+                $this->printer = new Escpos($this->connector);
+            } catch (Exception $e) {
+                $this->errors[] = $e->getMessage();
+                $error++;
+            }
+        }
+        return $error;
+    }
 }
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 375ab653d3c..af66f45d23c 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -49,7 +49,7 @@ class modReceiptPrinter 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));
-		// 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 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
         $this->description = "ReceiptPrinterDesc";
         $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
         $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index d95b1631b40..dc2cd392c20 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -57,16 +57,16 @@ DOL_PRINT_ORDER_LOCAL_TAX=Print order local tax
 DOL_PRINT_ORDER_TOTAL=Print order total
 DOL_PRINT_ORDER_NUMBER=Print order number
 DOL_PRINT_ORDER_NUMBER_UNIQUE=Print order number after validation
-DOL_PRINT_CUSTOMER_FIRST_NAME=Print customer firstname
-DOL_PRINT_CUSTOMER_LAST_NAME=Print customer name
+DOL_PRINT_CUSTOMER_FIRSTNAME=Print customer firstname
+DOL_PRINT_CUSTOMER_LASTNAME=Print customer name
 DOL_PRINT_CUSTOMER_MAIL=Print customer mail
-DOL_PRINT_CUSTOMER_TELEPHONE=Print customer phone
+DOL_PRINT_CUSTOMER_PHONE=Print customer phone
 DOL_PRINT_CUSTOMER_MOBILE=Print customer mobile
 DOL_PRINT_CUSTOMER_SKYPE=Print customer skype
 DOL_PRINT_CUSTOMER_TAX_NUMBER=Print customer VAT number
 DOL_PRINT_CUSTOMER_ACCOUNT_BALANCE=Print customer account balance
-DOL_PRINT_VENDOR_LAST_NAME=Print vendor name
-DOL_PRINT_VENDOR_FIRST_NAME=Print vendor firstname
+DOL_PRINT_VENDOR_LASTNAME=Print vendor name
+DOL_PRINT_VENDOR_FIRSTNAME=Print vendor firstname
 DOL_PRINT_VENDOR_MAIL=Print vendor mail
 DOL_PRINT_CUSTOMER_POINTS=Print customer points
 DOL_PRINT_ORDER_POINTS=Print number of points for this order

From f6991dd3ec814764927aca77c2399343f6e992c9 Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Wed, 4 Nov 2015 23:18:28 +0100
Subject: [PATCH 133/216] Moving new fields at the end

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

diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f16a29c2412..a3d30316522 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -354,7 +354,7 @@ if (empty($reshook))
 									$array_options = $lines[$i]->array_options;
 								}
 
-								$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, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code,$object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->fk_unit);
+								$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, $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) {
 									$error++;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5534e75a478..29be83ea3e2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1141,6 +1141,8 @@ class Commande extends CommonOrder
      *  @param		string			$label				Label
 	 *  @param		array			$array_options		extrafields array. Example array('options_codeforfield1'=>'valueforfield1', 'options_codeforfield2'=>'valueforfield2', ...)
      * 	@param 		string			$fk_unit 			Code of the unit to use. Null to use the default one
+     * 	@param		string		    $origin				'order', ...
+     *  @param		int			    $origin_id			Id of origin object
      *	@return     int             					>0 if OK, <0 if KO
      *
      *	@see        add_product
@@ -1150,7 +1152,7 @@ class Commande extends CommonOrder
      *	par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit)
      *	et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue)
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0)
     {
     	global $mysoc, $conf, $langs;
 

From 77371af35a7293f1f1a14a88ea4a29f271d82c55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 01:05:17 +0100
Subject: [PATCH 134/216] FIX #3661 Margin is not selected correctly when
 adding a product

---
 htdocs/core/lib/ajax.lib.php              |  1 +
 htdocs/core/tpl/objectline_create.tpl.php | 19 +++++++++++--------
 htdocs/fourn/ajax/getSupplierPrices.php   |  6 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a1d2ac3cf02..a4a94fe66c9 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -171,6 +171,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 									}
     							});
     						}
+    						console.log("ajax_autocompleter new value selected, we trigger change");
     						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
     					}
     					,delay: 500
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 938a615ea77..b779dae443b 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -489,6 +489,7 @@ jQuery(document).ready(function() {
 	});
 
 	$("#prod_entry_mode_predef").on( "click", function() {
+		console.log("click prod_entry_mode_predef");
 		setforpredef();
 		jQuery('#trlinefordates').show();
 	});
@@ -496,6 +497,7 @@ jQuery(document).ready(function() {
 	/* When changing predefined product, we reload list of supplier prices */
 	$("#idprod, #idprodfournprice").change(function()
 	{
+		console.log("change #idprod, #idprodfournprice, conf->global->MARGIN_TYPE=<?php echo $conf->global->MARGIN_TYPE ?>");
 		setforpredef();
 		jQuery('#trlinefordates').show();
 
@@ -516,6 +518,7 @@ jQuery(document).ready(function() {
     	  		var options = '';
     	  		var defaultkey = '';
     	  		var defaultprice = '';
+	      		var bestpricefound = 0;
 	      		var i = 0;
 	      		$(data).each(function() {
 	      			if (this.id != 'pmpprice')
@@ -523,24 +526,23 @@ jQuery(document).ready(function() {
 		        		i++;
 
 			      		// If margin is calculated on best supplier price, we set it by defaut (but only if value is not 0)
-		      			var defaultbuyprice = '<?php echo ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')?'bestsupplierprice':''); ?>';
-		      			if (i == 1 && this.price > 0 && 'bestsupplierprice' == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; }
-
-		        		options += '<option value="'+this.id+'" price="'+this.price+'"';
-		        		if (this.price > 0 && i == 1) { defaultkey = this.id; defaultprice = this.price; }
-		        		options += '>'+this.label+'</option>';
+		      			var defaultbuyprice = '<?php echo ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1')?'bestsupplierprice':''); ?>';	// We set here default value to use
+			      		console.log(this.id+" "+this.price+" "+defaultbuyprice+" "+(this.price > 0));
+		      			if (bestpricefound == 0 && this.price > 0 && 'bestsupplierprice' == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; bestpricefound=1; }	// bestpricefound is used to take the first price > 0
 		      		}
 	      			if (this.id == 'pmpprice')
 	      			{
 	      				// If margin is calculated on PMP, we set it by defaut (but only if value is not 0)
 		      			var defaultbuyprice = '<?php echo ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')?'pmp':''); ?>';
+			      		console.log(this.id+" "+this.price+" "+defaultbuyprice);
 		      			if (this.price > 0 && 'pmp' == defaultbuyprice) { defaultkey = this.id; defaultprice = this.price; }
-
-	    	      		options += '<option value="'+this.id+'" price="'+this.price+'">'+this.label+'</option>';
 	      			}
+	        		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("defaultkey="+defaultkey);
+
 	      		$("#fournprice_predef").html(options).show();
 	      		if (defaultkey != '')
 				{
@@ -555,6 +557,7 @@ jQuery(document).ready(function() {
 	      		$("#buying_price").val(Math.round(defaultprice,<?php print ($conf->global->MAIN_MAX_DECIMALS_UNIT ? $conf->global->MAIN_MAX_DECIMALS_UNIT : 5); ?>));
 
 	      		$("#fournprice_predef").change(function() {
+		      		console.log("change on fournprice_predef");
 	      			/* Hide field buying_price according to choice into list (if 'inputprice' or not) */
 					var linevalue=$(this).find('option:selected').val();
 	        		var pricevalue = $(this).find('option:selected').attr("price");
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index c39acd9dd29..664c8a2da4e 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -38,7 +38,7 @@ $langs->load('stocks');
 
 /*
  * View
-*/
+ */
 
 top_httphead();
 
@@ -59,7 +59,7 @@ if ($idprod > 0)
 	$sql.= " WHERE pfp.fk_product = ".$idprod;
 	$sql.= " AND p.tobuy = 1";
 	$sql.= " AND s.fournisseur = 1";
-	$sql.= " ORDER BY s.nom, pfp.ref_fourn DESC";
+	$sql.= " ORDER BY pfp.unitprice, s.nom, pfp.ref_fourn DESC";           // Best price first
 
 	dol_syslog("Ajax::getSupplierPrices", LOG_DEBUG);
 	$result=$db->query($sql);
@@ -117,7 +117,7 @@ if ($idprod > 0)
 				$label = price($price,0,$langs,0,0,-1,$conf->currency)."/".$langs->trans("Unit");
 				if ($objp->ref_fourn) $label.=' ('.$objp->ref_fourn.')';
 
-				$prices[] = array("id" => $objp->idprodfournprice, "price" => price($price,0,'',0), "label" => $label, "title" => $title);
+				$prices[] = array("id" => $objp->idprodfournprice, "price" => price2num($price,0,'',0), "label" => $label, "title" => $title);  // For price field, we must use price2num(), for label or title, price()
 				$i++;
 			}
 

From a612289136ae83dff50efff777dea8d353fe99cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 03:02:31 +0100
Subject: [PATCH 135/216] FIX Storing and deleting files on emailing was done
 at wrong place

---
 htdocs/comm/mailing/card.php      | 14 +++++++++++---
 htdocs/core/lib/functions.lib.php |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 8ab7fc91233..2ff7796bfae 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -544,7 +544,7 @@ if (empty($reshook))
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	    dol_remove_file_process($_POST['removedfile'],0);
+	    dol_remove_file_process($_POST['removedfile'],0,0);    // We really delete file linked to mailing
 
 		$action="edit";
 	}
@@ -1093,7 +1093,10 @@ else
 			}
 
 			print '</table>';
-			print "</div>";
+			
+			dol_fiche_end();
+			
+			
 
 			print "\n";
 			print '<form name="edit_mailing" action="card.php" method="post" enctype="multipart/form-data">'."\n";
@@ -1103,6 +1106,9 @@ else
 
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"),'','');
+
+			dol_fiche_head();
+			
 			print '<table class="border" width="100%">';
 
 			// Subject
@@ -1168,7 +1174,9 @@ else
 
 			print '</table>';
 
-			print '<br><div class="center">';
+			dol_fiche_end();
+			
+			print '<div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'" name="save">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button" value="'.$langs->trans("Cancel").'" name="cancel">';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 78dfcf11706..727dd9d8a9e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3860,7 +3860,7 @@ function get_exdir($num,$level,$alpha,$withoutslash,$object,$modulepart)
 
 	$path = '';
 
-	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier')))
+	if (! empty($level) && in_array($modulepart, array('cheque','user','category','holiday','shipment', 'member','don','donation','supplier_invoice','invoice_supplier','mailing')))
 	{
 		// 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);

From fa413fea76bdfbc1829c1407942c87a425706a80 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 03:12:57 +0100
Subject: [PATCH 136/216] FIX #3813

---
 htdocs/comm/propal/class/propal.class.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8710c76a72a..390e05363bb 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1049,13 +1049,17 @@ class Propal extends CommonObject
                 $clonedObj->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
                 $clonedObj->fk_delivery_address	= '';
             	
-            	$project = new Project($db);
-				if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
-					if ($project->socid <= 0) $clonedObj->fk_project = $this->fk_project;
-					else $clonedObj->fk_project = '';
-				} else {
-					$clonedObj->fk_project = '';
-				}
+                /*if (!empty($conf->projet->enabled))
+                {
+                    $project = new Project($db);
+    				if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
+    					if ($project->socid <= 0) $clonedObj->fk_project = $this->fk_project;
+    					else $clonedObj->fk_project = '';
+    				} else {
+    					$clonedObj->fk_project = '';
+    				}
+                }*/
+                $clonedObj->fk_project = '';    // A cloned proposal is set by default to no project.
             }
 
             // reset ref_client

From 1a374ddd2cb42fbda198e6d9b916218d19d071a5 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 08:42:03 +0100
Subject: [PATCH 137/216] Receipt Printer conf and lang

---
 .tx/config                                      | 6 ++++++
 htdocs/cashdesk/admin/cashdesk.php              | 2 +-
 htdocs/core/modules/modReceiptPrinter.class.php | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.tx/config b/.tx/config
index 3c8c49e40e9..72f4a8dfffa 100644
--- a/.tx/config
+++ b/.tx/config
@@ -284,6 +284,12 @@ source_file = htdocs/langs/en_US/propal.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.receiptprinter]
+file_filter = htdocs/langs/<lang>/receiptprinter.lang
+source_file = htdocs/langs/en_US/receiptprinter.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.resource]
 file_filter = htdocs/langs/<lang>/resource.lang
 source_file = htdocs/langs/en_US/resource.lang
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index a7c1b419012..8946259a6fd 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -175,7 +175,7 @@ if (! empty($conf->receiptprinter->enabled))
 {
     $var=! $var;
     print '<tr '.$bc[$var].'><td>';
-    print $langs->trans("DolibarrReceiptPrinter");
+    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);
     print "</td></tr>\n";
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index af66f45d23c..975226819fb 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -51,7 +51,7 @@ class modReceiptPrinter extends DolibarrModules
         $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 = "ReceiptPrinterDesc";
-        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'development';    // 'development' or 'experimental' or 'dolibarr' or version
         $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;

From 41ccfc411a2a433bce41bf227f0935f8b985eb71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 10:11:39 +0100
Subject: [PATCH 138/216] Better error message

---
 .../modules/printing/printgcp.modules.php     | 34 +++++++++++++------
 htdocs/langs/en_US/printing.lang              |  1 +
 htdocs/printing/index.php                     | 16 ++++++---
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 069762dde23..599a6645222 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -369,7 +369,8 @@ class printing_printgcp extends PrintingDriver
      */
     function list_jobs()
     {
-        global $conf, $db, $bc;
+        global $conf, $db, $langs, $bc;
+        
         $error = 0;
         $html = '';
         // Token storage
@@ -432,20 +433,31 @@ class printing_printgcp extends PrintingDriver
         $var = True;
         $jobs = $responsedata['jobs'];
         //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
-        foreach ($jobs as $value )
+        if (is_array($jobs))
         {
-            $var = !$var;
-            $html .= '<tr '.$bc[$var].'>';
-            $html .= '<td>'.$value['id'].'</td>';
-            $html .= '<td>'.$value['ownerId'].'</td>';
-            $html .= '<td>'.$value['printerName'].'</td>';
-            $html .= '<td>'.$value['title'].'</td>';
-            $html .= '<td>'.$value['status'].'</td>';
-            $html .= '<td>&nbsp;</td>';
-            $html .= '</tr>';
+            foreach ($jobs as $value)
+            {
+                $var = !$var;
+                $html .= '<tr '.$bc[$var].'>';
+                $html .= '<td>'.$value['id'].'</td>';
+                $html .= '<td>'.$value['ownerId'].'</td>';
+                $html .= '<td>'.$value['printerName'].'</td>';
+                $html .= '<td>'.$value['title'].'</td>';
+                $html .= '<td>'.$value['status'].'</td>';
+                $html .= '<td>&nbsp;</td>';
+                $html .= '</tr>';
+            }
+        }
+        else
+        {
+                $html .= '<tr '.$bc[$var].'>';
+                $html .= '<td colspan="6">'.$langs->trans("None").'</td>';
+                $html .= '</tr>';
         }
         $html .= '</table>';
+        
         $this->resprint = $html;
+        
         return $error;
     }
 
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index 2e05349cfc8..a4f9fe09e04 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -81,5 +81,6 @@ STATE_IPP_none=None
 MEDIA_IPP_stationery=Stationery
 MEDIA_IPP_thermal=Thermal
 IPP_COLOR_print-black=BW Printer
+DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials found.
\ No newline at end of file
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 1a1b038d47f..d263c60db8d 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -29,19 +29,25 @@ llxHeader("",$langs->trans("Printing"));
 
 print load_fiche_titre($langs->trans("Printing"));
 
+print $langs->trans("DirectPrintingJobsDesc").'<br><br>';
+
 // List Jobs from printing modules
 $object = new PrintingDriver($db);
 $result = $object->listDrivers($db, 10);
-foreach ($result as $driver) {
+foreach ($result as $driver) 
+{
     require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
     $classname = 'printing_'.$driver;
     $langs->load($driver);
     $printer = new $classname($db);
-    if ($conf->global->{$printer->active}) {
+    if ($conf->global->{$printer->active}) 
+    {
         //$printer->list_jobs('commande');
-        if ($printer->list_jobs()==0) {
-            print $printer->resprint;
-        } else {
+        $result = $printer->list_jobs();
+        print $printer->resprint;
+        
+        if ($result > 0) 
+        {
             setEventMessages($printer->error, $printer->errors, 'errors');
         }
     }

From 0543a3192006eed4b24f331e5aef1833ebbfc396 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 5 Nov 2015 11:11:03 +0100
Subject: [PATCH 139/216] FIX event's data lost on user assign update

---
 htdocs/comm/action/card.php | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index c011717c0cc..92300a35368 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -88,7 +88,7 @@ $hookmanager->initHooks(array('actioncard','globalcard'));
 /*
  * Actions
  */
-
+$listUserAssignedUpdated = false;
 // Remove user to assigned list
 if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
 {
@@ -106,6 +106,8 @@ if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
 	$donotclearsession=1;
 	if ($action == 'add') $action = 'create';
 	if ($action == 'update') $action = 'edit';
+	
+	$listUserAssignedUpdated = true;
 }
 
 // Add user to assigned list
@@ -125,6 +127,8 @@ if (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser'))
 	$donotclearsession=1;
 	if ($action == 'add') $action = 'create';
 	if ($action == 'update') $action = 'edit';
+	
+	$listUserAssignedUpdated = true;
 }
 
 // Add event
@@ -803,6 +807,28 @@ if ($id > 0)
 	$result4=$object->fetch_userassigned();
 	$result5=$object->fetch_optionals($id,$extralabels);
 
+	if($listUserAssignedUpdated) {
+		
+		$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"]);
+
+		$object->fk_action   = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
+		$object->label       = GETPOST("label");
+		$object->datep       = $datep;
+		$object->datef       = $datef;
+		$object->percentage  = $percentage;
+		$object->priority    = GETPOST("priority");
+        $object->fulldayevent= GETPOST("fullday")?1:0;
+		$object->location    = GETPOST('location');
+		$object->socid       = GETPOST("socid");
+		$object->contactid   = GETPOST("contactid",'int');
+		//$object->societe->id = $_POST["socid"];			// deprecated
+		//$object->contact->id = $_POST["contactid"];		// deprecated
+		$object->fk_project  = GETPOST("projectid",'int');
+		
+		$object->note = GETPOST("note");
+	}
+
 	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
 	{
 		dol_print_error($db,$object->error);

From b9c0cd316f6dc6e9c153ad95381a8689b967b100 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 5 Nov 2015 11:11:51 +0100
Subject: [PATCH 140/216] [Qual] Fix : TODO:translate

---
 htdocs/langs/en_US/admin.lang    | 1 +
 htdocs/product/admin/product.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 367d0edc416..459214b45fb 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1424,6 +1424,7 @@ SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Module for product code generation and checking (product or service)
 ProductOtherConf= Product / Service configuration
+IsNotADir=is not a directory!
 ##### Syslog #####
 SyslogSetup=Logs module setup
 SyslogOutput=Logs outputs
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index ec2c17d77ac..9c979862933 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -518,8 +518,7 @@ if (! empty($conf->global->PRODUCT_CANVAS_ABILITY))
 	}
 	else
 	{
-		//TODO: Translate
-		print "<tr><td><b>ERROR</b>: $dir is not a directory !</td></tr>\n";
+		setEventMessages($dir.' '.$langs->trans("IsNotADir"), null, 'errors');
 	}
 }
 

From e1ea2215a3b1f753ea45d1415825bb7e40a62ae3 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 5 Nov 2015 11:25:04 +0100
Subject: [PATCH 141/216] FIX loss data also if update was cancel by error of
 ended state with no end date, try a generic patch

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

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 92300a35368..9d6f9590a1c 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -807,7 +807,7 @@ if ($id > 0)
 	$result4=$object->fetch_userassigned();
 	$result5=$object->fetch_optionals($id,$extralabels);
 
-	if($listUserAssignedUpdated) {
+	if($listUserAssignedUpdated || $donotclearsession) {
 		
 		$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"]);

From 9b797c1831932ef0bd0c1ddacbba2535070c2a0b Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 12:49:43 +0100
Subject: [PATCH 142/216] FIX bad calculation for stock value

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 htdocs/product/stock/fiche.php                | 8 ++++----
 htdocs/product/stock/valo.php                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 1056829838b..a21c57e2657 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -418,7 +418,7 @@ class Entrepot extends CommonObject
 	{
 		$ret=array();
 
-		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ps.pmp) as value";
+		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."product as p";
 		$sql.= " WHERE ps.fk_entrepot = ".$this->id;
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index a60deff921e..22b70fda280 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -364,7 +364,7 @@ else
 			print_liste_field_titre($langs->trans("Product"),"", "p.ref","&amp;id=".$_GET['id'],"","",$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Label"),"", "p.label","&amp;id=".$_GET['id'],"","",$sortfield,$sortorder);
             print_liste_field_titre($langs->trans("Units"),"", "ps.reel","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "ps.pmp","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "p.pmp","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("EstimatedStockValueShort"),"", "","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellPriceMin"),"", "p.price","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&amp;id=".$_GET['id'],"",'align="right"',$sortfield,$sortorder);
@@ -426,10 +426,10 @@ else
 					$totalunit+=$objp->value;
 
                     // Price buy PMP
-					print '<td align="right">'.price(price2num($objp->pmp,'MU')).'</td>';
+					print '<td align="right">'.price(price2num($objp->ppmp,'MU')).'</td>';
                     // Total PMP
-					print '<td align="right">'.price(price2num($objp->pmp*$objp->value,'MT')).'</td>';
-					$totalvalue+=price2num($objp->pmp*$objp->value,'MT');
+					print '<td align="right">'.price(price2num($objp->ppmp*$objp->value,'MT')).'</td>';
+					$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
 
                     // Price sell min
                     if (empty($conf->global->PRODUIT_MULTIPRICES))
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index e7d782ae5e0..3c00168d82b 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -53,7 +53,7 @@ $year = strftime("%Y",time());
 
 // Affichage valorisation par entrepot
 $sql = "SELECT e.rowid as ref, e.label, e.statut, e.lieu,";
-$sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
+$sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
 $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";

From 6e8a6eca7a4dbdb57251e4c1e27dc9bbb0f0c3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 5 Nov 2015 13:05:08 +0100
Subject: [PATCH 143/216] Fixed feature malfunction caused by commit
 a161e6d47a687e348de4c416a02fbee2b6deaa81 and previous changes

---
 htdocs/product/price.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 8822fd9f7f4..15a9d205a9e 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -895,7 +895,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 
 			var showHidePriceRules = function () {
 				var otherPrices = $('div.fiche form:not(:first)');
-				var minPrice1 = $('div.fiche form:first tr:eq(3)');
+				var minPrice1 = $('div.fiche form:first tr:eq(1)');
 
 				if (jQuery('input#usePriceRules').prop('checked')) {
 					otherPrices.hide();
@@ -914,16 +914,14 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		</script>
 		<?php
 
-		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>';
-		}
-		
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
 		    
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 		    if ($i > 1) print '<br>';
+			elseif (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
+				print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" value="on" '.($object->price_autogen ? 'checked' : '').'><br><br>';
+			}
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="update_price">';
 			print '<input type="hidden" name="id" value="' . $object->id . '">';

From e64057c2761ef418011d395ed1071d5d852f3881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 5 Nov 2015 13:07:44 +0100
Subject: [PATCH 144/216] Removed unnecesary attribute

---
 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 15a9d205a9e..69802f51d57 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -920,7 +920,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
 		    if ($i > 1) print '<br>';
 			elseif (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
-				print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" value="on" '.($object->price_autogen ? 'checked' : '').'><br><br>';
+				print $langs->trans('UseMultipriceRules'). ' <input type="checkbox" id="usePriceRules" name="usePriceRules" '.($object->price_autogen ? 'checked' : '').'><br><br>';
 			}
 			print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 			print '<input type="hidden" name="action" value="update_price">';

From d2fa580f5d40bfee3b6f0dd5e115193c9e8ece8d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 13:43:22 +0100
Subject: [PATCH 145/216] The code generator can generate a list.php page with
 all feature immediatly working (sort, extrafields, hooks, select fields to
 show...)

---
 dev/skeletons/build_class_from_table.php |  63 +++-
 dev/skeletons/skeleton_card.php          |   2 +-
 dev/skeletons/skeleton_list.php          | 402 ++++++++++++++++-------
 htdocs/user/card.php                     |   2 +-
 htdocs/user/index.php                    |  39 +--
 5 files changed, 365 insertions(+), 143 deletions(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 6aff50161a9..33c83bcc356 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -524,6 +524,19 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     $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);
@@ -541,6 +554,32 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     $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='';
@@ -548,12 +587,24 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="print_liste_field_titre(\$langs->trans('".$prop['field']."'),\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$param,'',\$sortfield,\$sortorder);\n";
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print_liste_field_titre(\$arrayfields['t.".$prop['field']."']['label'],\$_SERVER['PHP_SELF'],'t.".$prop['field']."','',\$param,'',\$sortfield,\$sortorder);\n";
     	}
     }
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field1']['checked'])) print_liste_field_titre(\$langs->trans('field1'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("if (! empty(\$arrayfields['t.field2']['checked'])) print_liste_field_titre(\$langs->trans('field2'),\$_SERVER['PHP_SELF'],'t.field2','',\$param,'',\$sortfield,\$sortorder);",'/').'/', '', $targetcontent);
     
-    $targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field1'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("print_liste_field_titre(\$langs->trans('field2'),\$_SERVER['PHP_SELF'],'t.field1','',\$param,'',\$sortfield,\$sortorder);",'/').'/', '', $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('/'.preg_quote("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>';",'/').'/', $varprop, $targetcontent);
+    $targetcontent=preg_replace('/'.preg_quote("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>';",'/').'/', '', $targetcontent);
     
     // Substitute where for <td>.fieldx.</td>
     $varprop="\n";
@@ -562,11 +613,11 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
+    	    $varprop.="if (! empty(\$arrayfields['t.".$prop['field']."']['checked'])) print '<td>'.\$obj->".$prop['field'].".'</td>';\n";
     	}
     }
-    $targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field1.'</td>';",'/').'/', $varprop, $targetcontent);
-    $targetcontent=preg_replace('/'.preg_quote("print '<td>'.\$obj->field2.'</td>';",'/').'/', '', $targetcontent);
+    $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);
 
     // Build file
     $fp=fopen($outfile,"w");
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index a7191560108..8b643ff3f6c 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -47,7 +47,7 @@ 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("companies");
+$langs->load("mymodule");
 $langs->load("other");
 
 // Get parameters
diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index 06a88a23020..e2452324d99 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -47,7 +47,7 @@ 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("companies");
+$langs->load("mymodule");
 $langs->load("other");
 
 // Get parameters
@@ -58,14 +58,35 @@ $myparam	= GETPOST('myparam','alpha');
 
 $search_field1=GETPOST("search_field1");
 $search_field2=GETPOST("search_field2");
+$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();
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action='list';
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('skeletonlist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('mymodule');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 
 // Load object if id or ref is provided as parameter
 $object=new Skeleton_Class($db);
@@ -75,9 +96,7 @@ if (($id > 0 || ! empty($ref)) && $action != 'add')
 	if ($result < 0) dol_print_error($db);
 }
 
-// Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('skeleton'));
-$extrafields = new ExtraFields($db);
+
 
 
 
@@ -91,6 +110,18 @@ $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions',$parameters);    // 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")) // All test are required to be compatible with all browsers
+{
+	$search_field1='';
+	$search_field2='';
+	$search_date_creation='';
+	$search_date_update='';
+	$search_array_options=array();
+}
+
+
 if (empty($reshook))
 {
 	// Action to delete
@@ -125,8 +156,8 @@ llxHeader('','MyPageName','');
 
 $form=new Form($db);
 
-
 // Put here content of your page
+print load_fiche_titre('PageTitle');
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
@@ -144,123 +175,262 @@ jQuery(document).ready(function() {
 </script>';
 
 
-// Part to show a list
-if ($action == 'list' || (empty($id) && $action != 'create'))
+$sql = "SELECT";
+$sql.= " t.rowid,";
+$sql.= " t.field1,";
+$sql.= " t.field2";
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",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 (u.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)
 {
-	// Put here content of your page
-	print load_fiche_titre('PageTitle');
-    
-	$sql = "SELECT";
-    $sql.= " t.rowid,";
-    $sql.= " t.field1,";
-    $sql.= " t.field2";
-	// Add fields for extrafields
-	foreach ($extrafields->attribute_list as $key => $val) $sql.=",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";
-    $sql.= " WHERE 1 = 1";
-    if ($search_field1) $sql.= natural_search("field1",$search_field1);
-    if ($search_field2) $sql.= natural_search("field2",$search_field2);
-    
-	// 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;
-
-    // Count total nb of records
-    $nbtotalofrecords = 0;
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+    $crit=$val;
+    $tmpkey=preg_replace('/search_options_/','',$key);
+    $typ=$extrafields->attribute_type[$tmpkey];
+    $mode=0;
+    if (in_array($typ, array('int'))) $mode=1;    // Search on a numeric
+    if ($val && ( ($crit != '' && ! in_array($typ, array('select'))) || ! empty($crit))) 
     {
-    	$result = $db->query($sql);
-    	$nbtotalofrecords = $db->num_rows($result);
-    }	
+        $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 = 0;
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}	
+
+$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+
+dol_syslog($script_file, LOG_DEBUG);
+$resql=$db->query($sql);
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+    
+    $params='';
+	if ($search_field1 != '') $params.= '&amp;search_field1='.urlencode($search_field1);
+	if ($search_field2 != '') $params.= '&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);
+    } 
+    
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies');
+    
+
+	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'].'">';
+	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.'">';
 	
-    $sql.= $db->order($sortfield, $sortorder);
-	$sql.= $db->plimit($conf->liste_limit+1, $offset);
-    
-
-    dol_syslog($script_file, LOG_DEBUG);
-    $resql=$db->query($sql);
-    if ($resql)
+    if ($sall)
     {
-        $num = $db->num_rows($resql);
-        
-        $params='';
-    	$params.= '&amp;search_field1='.urlencode($search_field1);
-    	$params.= '&amp;search_field2='.urlencode($search_field2);
-        
-        print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_companies');
-        
-    
-    	print '<form method="GET" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-    
-    	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>';
-    	}
-    
-    	print '<table class="liste">'."\n";
-    
-        // Fields title
-        print '<tr class="liste_titre">';
-        print_liste_field_titre($langs->trans('field1'),$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
-        print_liste_field_titre($langs->trans('field2'),$_SERVER['PHP_SELF'],'t.field2','',$param,'',$sortfield,$sortorder);
-        $parameters=array();
-        $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</tr>'."\n";
-    
-        // Fields title search
-    	print '<tr class="liste_titre">';
-    	print '<td class="liste_titre"><input type="text" class="flat" name="search_field1" value="'.$search_field1.'" size="10"></td>';
-    	print '<td class="liste_titre"><input type="text" class="flat" name="search_field2" value="'.$search_field2.'" size="10"></td>';
-        $parameters=array();
-        $reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        print '</tr>'."\n";
-            
-        
-        $i = 0;
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
-            if ($obj)
-            {
-                // You can use here results
-                print '<tr>';
-                print '<td>'.$obj->field1.'</td>';
-                print '<td>'.$obj->field2.'</td>';
-		        $parameters=array('obj' => $obj);
-        		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
-                print $hookmanager->resPrint;
-        		print '</tr>';
-            }
-            $i++;
-        }
-        
-        $db->free($resql);
-    
-    	$parameters=array('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 "</form>\n";
-        
+        foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print $langs->trans("FilterOnInto", $sall, join(', ',$fieldstosearchall));
     }
-    else
+    
+	if (! empty($moreforfilter))
 	{
-        $error++;
-        dol_print_error($db);
+		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>';
+	}
+
+	$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("DateCreation"), '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]);
+	   }
+	}
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	
+	print '<table class="liste '.($moreforfilter?"listwithfilterbefore":"").'">';
+
+    // Fields title
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['t.field1']['checked'])) print_liste_field_titre($langs->trans('field1'),$_SERVER['PHP_SELF'],'t.field1','',$param,'',$sortfield,$sortorder);
+    if (! empty($arrayfields['t.field2']['checked'])) print_liste_field_titre($langs->trans('field2'),$_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($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+	if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"t.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";
+
+    // Fields title search
+	print '<tr class="liste_titre">';
+	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'])) print '<td class="liste_titre"></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">';
+	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 '<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")).'">';
+	print '</td>';
+	print '</tr>'."\n";
+        
+    
+    $i = 0;
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($resql);
+        if ($obj)
+        {
+            // You can use here results
+            print '<tr>';
+            if (! empty($arrayfields['t.field1']['checked'])) print '<td>'.$obj->field1.'</td>';
+            if (! empty($arrayfields['t.field2']['checked'])) print '<td>'.$obj->field2.'</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, $obj->$tmpkey, '', 1);
+    					print '</td>';
+    				}
+    		   }
+    		}
+            // 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>';
+            }
+            // Date modification
+            if (! empty($arrayfields['t.tms']['checked']))
+            {
+                print '<td align="center">';
+                print dol_print_date($db->jdate($obj->date_update), 'dayhour');
+                print '</td>';
+            }
+            // Status
+            /*
+            if (! empty($arrayfields['u.statut']['checked']))
+            {
+    		  $userstatic->statut=$obj->statut;
+              print '<td align="center">'.$userstatic->getLibStatut(3).'</td>';
+            }*/
+            // Action column
+            print '<td></td>';
+    		print '</tr>';
+        }
+        $i++;
+    }
+    
+    $db->free($resql);
+
+	$parameters=array('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 "</form>\n";
+	
+	$db->free($result);
+}
+else
+{
+    $error++;
+    dol_print_error($db);
 }
 
 
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 83762e988ee..42e1617e4c1 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -92,7 +92,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. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('usercard','globalcard'));
 
 
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 28699839a18..9c1828653ac 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -55,6 +55,7 @@ $optioncss = GETPOST('optioncss','alpha');
 
 if ($search_statut == '') $search_statut='1';
 
+// Load variable for pagination
 $limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit;
 $sortfield = GETPOST('sortfield','alpha');
 $sortorder = GETPOST('sortorder','alpha');
@@ -78,24 +79,6 @@ $userstatic=new User($db);
 $companystatic = new Societe($db);
 $form = new Form($db);
 
-if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
-{
-	$search_user="";
-	$search_login="";
-	$search_lastname="";
-	$search_firstname="";
-	$search_accountancy_code="";
-	$search_email="";
-	$search_statut="";
-	$search_thirdparty="";
-	$search_supervisor="";
-	$search_datelastlogin="";
-	$search_datepreviouslogin="";
-	$search_date_creation="";
-	$search_date_update="";
-	$search_array_options=array();
-}
-
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'u.login'=>"Login",
@@ -117,6 +100,24 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") ||GETPOST("button_removefilter")) // All test are required to be compatible with all browsers
+{
+	$search_user="";
+	$search_login="";
+	$search_lastname="";
+	$search_firstname="";
+	$search_accountancy_code="";
+	$search_email="";
+	$search_statut="";
+	$search_thirdparty="";
+	$search_supervisor="";
+	$search_datelastlogin="";
+	$search_datepreviouslogin="";
+	$search_date_creation="";
+	$search_date_update="";
+	$search_array_options=array();
+}
+
 
 
 /*
@@ -248,7 +249,7 @@ if ($result)
 	}
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-    print '<table class="noborder" width="100%">';
+    print '<table class="liste">';
     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);

From 04238da75d3207ee59aa34d39ff6ee3a43d76627 Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Thu, 5 Nov 2015 14:16:13 +0100
Subject: [PATCH 146/216] Typo

---
 htdocs/core/class/hookmanager.class.php | 2 +-
 htdocs/core/lib/pdf.lib.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e7002e83aff..7bd41d8315f 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -118,7 +118,7 @@ class HookManager
      * 		@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 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.
      *                                          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.
      */
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index b2b4ac12677..8e0eef6d53b 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -515,7 +515,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
 	global $conf;
 
 	// Add a background image on document
-	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image
+	if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 	{
 		$pdf->SetAutoPageBreak(0,0);	// Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);

From b0cf9bd0bebafdaebfe20cc02c4549b5cae1b357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 5 Nov 2015 14:38:11 +0100
Subject: [PATCH 147/216] Fix #3864 Really fixed invalid jQuery code

---
 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 190fad96c51..b36f61973ee 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -446,7 +446,7 @@ jQuery(document).ready(function() {
 		<?php if (! empty($usemargins) && $user->rights->margins->creer) { ?>
 
 		/* Code for margin */
-  		$("#fournprice_predef option").each.remove();
+  		$("#fournprice_predef").find("option").remove();
 		$("#fournprice_predef").hide();
 		$("#buying_price").val("").show();
   		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', { 'idprod': $(this).val() }, function(data) {

From fa088eb6cc23185e09bbfa18cd1c53afbebd33b9 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 14:57:58 +0100
Subject: [PATCH 148/216] FIX bad calculation for stock value

---
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 htdocs/product/stock/fiche.php                | 8 ++++----
 htdocs/product/stock/valo.php                 | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 2b1b368ef8c..6cb2e75fc32 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -418,7 +418,7 @@ class Entrepot extends CommonObject
 	{
 		$ret=array();
 
-		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * ps.pmp) as value";
+		$sql = "SELECT sum(ps.reel) as nb, sum(ps.reel * p.pmp) as value";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 		$sql.= ", ".MAIN_DB_PREFIX."product as p";
 		$sql.= " WHERE ps.fk_entrepot = ".$this->id;
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index 8b7aa43b431..4f43b3f6c91 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -369,7 +369,7 @@ else
 			print_liste_field_titre($langs->trans("Product"),"", "p.ref","&amp;id=".$id,"","",$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("Label"),"", "p.label","&amp;id=".$id,"","",$sortfield,$sortorder);
             print_liste_field_titre($langs->trans("Units"),"", "ps.reel","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
-            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "ps.pmp","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
+            print_liste_field_titre($langs->trans("AverageUnitPricePMPShort"),"", "p.pmp","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre($langs->trans("EstimatedStockValueShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("SellPriceMin"),"", "p.price","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
             if (empty($conf->global->PRODUIT_MULTIPRICES)) print_liste_field_titre($langs->trans("EstimatedStockValueSellShort"),"", "","&amp;id=".$id,"",'align="right"',$sortfield,$sortorder);
@@ -431,10 +431,10 @@ else
 					$totalunit+=$objp->value;
 
                     // Price buy PMP
-					print '<td align="right">'.price(price2num($objp->pmp,'MU')).'</td>';
+					print '<td align="right">'.price(price2num($objp->ppmp,'MU')).'</td>';
                     // Total PMP
-					print '<td align="right">'.price(price2num($objp->pmp*$objp->value,'MT')).'</td>';
-					$totalvalue+=price2num($objp->pmp*$objp->value,'MT');
+					print '<td align="right">'.price(price2num($objp->ppmp*$objp->value,'MT')).'</td>';
+					$totalvalue+=price2num($objp->ppmp*$objp->value,'MT');
 
                     // Price sell min
                     if (empty($conf->global->PRODUIT_MULTIPRICES))
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 75b85af00fa..93d2f0a9152 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -53,7 +53,7 @@ $year = strftime("%Y",time());
 
 // Affichage valorisation par entrepot
 $sql = "SELECT e.rowid as ref, e.label, e.statut, e.lieu,";
-$sql.= " SUM(ps.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
+$sql.= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
 $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";

From f566b382969841bd32b0d7ba314c73d3e80ecc86 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 15:29:51 +0100
Subject: [PATCH 149/216] FIX pmp

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 6b08dd16ecf..a8807c5ea8e 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -578,9 +578,10 @@ if ( (! empty($conf->productbatch->enabled)) && $product->hasbatch()) {
 	print '</tr>';
 }
 
-$sql = "SELECT e.rowid, e.label, ps.reel, ps.pmp, ps.rowid as product_stock_id";
+$sql = "SELECT e.rowid, e.label, ps.reel, p.pmp, ps.rowid as product_stock_id";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 $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).")";

From 75bcb7e53f2dcb3b71cd7c4e8712b473a36ac2e8 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 15:32:56 +0100
Subject: [PATCH 150/216] fix pmp

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

diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 7896476775a..a11e7f355f5 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -528,9 +528,10 @@ print '<td align="right">'.$langs->trans("SellPriceMin").'</td>';
 print '<td align="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
 print '</tr>';
 
-$sql = "SELECT e.rowid, e.label, ps.reel, ps.pmp";
+$sql = "SELECT e.rowid, e.label, ps.reel, p.pmp";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 $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 = ".$conf->entity;

From ad821358790e17aa2619b3f2aad87be5ad74130a Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 15:36:13 +0100
Subject: [PATCH 151/216] FIX: change order date on clone (as everywhere else)

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

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 95441e5f257..cda6a9b8d8c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -906,6 +906,7 @@ class Commande extends CommonOrder
         // Clear fields
         $this->user_author_id     = $user->id;
         $this->user_valid         = '';
+		$this->date				  = dol_now();
         $this->date_creation      = '';
         $this->date_validation    = '';
         $this->ref_client         = '';

From 822181708762c5944f32fbb9e825e71a9125e91f Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Thu, 5 Nov 2015 16:17:09 +0100
Subject: [PATCH 152/216] NEW add an option to use standard ISO location for
 bill in crabe model For electronic sending solutions, it could be required

---
 htdocs/admin/pdf.php                            | 13 ++++++++++++-
 .../modules/facture/doc/pdf_crabe.modules.php   | 17 ++++++++++-------
 htdocs/langs/en_US/admin.lang                   |  1 +
 htdocs/langs/fr_FR/admin.lang                   |  1 +
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index f75bf57a972..3b968af09c3 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -62,7 +62,8 @@ if ($action == 'update')
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS", $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_DESC",    $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_DESC"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_GENERATE_DOCUMENTS_HIDE_REF",     $_POST["MAIN_GENERATE_DOCUMENTS_HIDE_REF"],'chaine',0,'',$conf->entity);
-
+	dolibarr_set_const($db, "MAIN_PDF_USE_ISO_LOCATION",     $_POST["MAIN_PDF_USE_ISO_LOCATION"],'chaine',0,'',$conf->entity);
+	
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
 	exit;
 }
@@ -247,6 +248,12 @@ if ($action == 'edit')	// Edit
     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>';
+
 
 	print '</table>';
 
@@ -444,6 +451,10 @@ else	// Show
 	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>';
 
 	print '</table>';
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 802bc9d3ad3..297913d7bd7 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1546,10 +1546,13 @@ class pdf_crabe extends ModelePDFFactures
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->client);
 
 			// Show sender
-			$posy=42;
+			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->marge_gauche;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-			$hautcadre=40;
+			
+			$hautcadre=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
 
 			// Show sender frame
 			$pdf->SetTextColor(0,0,0);
@@ -1558,19 +1561,19 @@ class pdf_crabe extends ModelePDFFactures
 			$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->MultiCell($widthrecbox, $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');
+			$pdf->MultiCell($widthrecbox-2, 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->MultiCell($widthrecbox-2, 4, $carac_emetteur, 0, 'L');
 
 
 
@@ -1596,9 +1599,9 @@ class pdf_crabe extends ModelePDFFactures
 			$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
 
 			// Show recipient
-			$widthrecbox=100;
+			$widthrecbox=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox=84;	// To work with US executive format
-			$posy=42;
+			$posy=!empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx=$this->page_largeur-$this->marge_droite-$widthrecbox;
 			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->marge_gauche;
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 459214b45fb..8f8428b3c75 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -366,6 +366,7 @@ HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
 HideDescOnPDF=Hide products description on generated PDF
 HideRefOnPDF=Hide products ref. on generated PDF
 HideDetailsOnPDF=Hide products lines details on generated PDF
+PlaceCustomerAddressToIsoLocation=Use ISO location for customer address
 Library=Library
 UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 7dd792059d9..0de11174d41 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -364,6 +364,7 @@ HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA
 HideDescOnPDF=Cacher la description des produits sur les PDF générés
 HideRefOnPDF=Cacher la référence des produits sur les PDF générés
 HideDetailsOnPDF=Cacher les détails des lignes de produits sur les PDF générés
+PlaceCustomerAddressToIsoLocation=Utiliser l'emplacement ISO pour l'addresse du destinatire
 Library=Bibliothèque
 UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?

From 8a765bf5fd32d12e2a798818a51cb572ac66c489 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 16:20:35 +0100
Subject: [PATCH 153/216] wip

---
 htdocs/admin/receiptprinter.php               |  6 +++---
 htdocs/core/class/dolreceiptprinter.class.php | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 8e3c7388adf..eb4a2da0570 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -425,7 +425,7 @@ if ($mode == 'template' && $user->admin)
 }
 
 // to remove after test
-$object->date = '2015-11-02 22:30:25';
+$object->date_time = '2015-11-02 22:30:25';
 $object->id = 1234;
 $object->customer_firstname  = 'John';
 $object->customer_lastname  = 'Deuf';
@@ -433,8 +433,8 @@ $object->vendor_firstname  = 'Jim';
 $object->vendor_lastname  = 'Big';
 
 $object->barcode = '3700123862396';
-//$printer->sendToPrinter($object, 1, 16);
-//setEventMessages($printer->error, $printer->errors, 'errors');
+$printer->sendToPrinter($object, 1, 16);
+setEventMessages($printer->error, $printer->errors, 'errors');
 
 llxFooter();
 
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 5271950706a..5afb24fe43e 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -429,6 +429,7 @@ class dolReceiptPrinter extends Escpos
         $this->template = str_replace('<dol_print_customer_account_balance>', $object->customer_account_balance, $this->template);
         $this->template = str_replace('<dol_print_vendor_firstname>', $object->vendor_firstname, $this->template);
         $this->template = str_replace('<dol_print_vendor_lastname>', $object->vendor_lastname, $this->template);
+        $this->template = str_replace('<dol_print_date_time>', $object->date_time, $this->template);
 
         // parse template
         $p = xml_parser_create();
@@ -438,6 +439,7 @@ class dolReceiptPrinter extends Escpos
         //print '<pre>'.print_r($vals, true).'</pre>';
         // print ticket
         $level = 0;
+        $html = '<table border="1" style="width:210px"><pre>';
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
@@ -446,33 +448,37 @@ class dolReceiptPrinter extends Escpos
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
                         $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
+                        $html.='<center>';
                         $this->printer->text($vals[$line]['value']);
                         break;
                     case 'DOL_ALIGN_RIGHT':
                         $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
+                        $html.='<right>';
                         break;
                     case 'DOL_ALIGN_LEFT':
                         $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
+                        $html.='<left>';
                         break;
                     case 'DOL_OPEN_DRAWER':
                         $this->printer->pulse();
+                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_PRINT_BARCODE':
                         // $vals[$line]['value'] -> barcode($content, $type)
                         $this->printer->barcode($object->barcode);
                         break;
-                    case 'DOL_PRINT_DATE_TIME':
-                        $this->printer->text($object->date);
-                        break;
                     case 'DOL_PRINT_QRCODE':
                         // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
                         $this->printer->qrcode($vals[$line]['value']);
+                        $html.='QRCODE: '.$vals[$line]['value'];
                         break;
                     case 'DOL_CUT_PAPER_FULL':
                         $this->printer->cut(Escpos::CUT_FULL);
+                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_CUT_PAPER_PARTIAL':
                         $this->printer->cut(Escpos::CUT_PARTIAL);
+                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_USE_FONT_A':
                         $this->printer->setFont(Escpos::FONT_A);
@@ -488,11 +494,14 @@ class dolReceiptPrinter extends Escpos
                         break;
                     default:
                         $this->printer->text($vals[$line]['value']);
+                        $html.= nl2br($vals[$line]['value']);
                         $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
                         $error++;
                         break;
                 }
             }
+            $html.= '</pre></table>';
+            print $html;
             // Close and print
             // uncomment next line to see content sent to printer
             //print '<pre>'.print_r($this->connector, true).'</pre>';

From 80d24455402b65b1519fad1c9f12093b829e5690 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 17:00:22 +0100
Subject: [PATCH 154/216] FIX: bad stock valorisation

---
 htdocs/commande/class/commande.class.php      | 4 ++--
 htdocs/compta/facture/class/facture.class.php | 2 +-
 htdocs/expedition/class/expedition.class.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 95441e5f257..b2654bfcee7 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -376,7 +376,7 @@ class Commande extends CommonOrder
                     {
                         $mouvP = new MouvementStock($this->db);
                         // We increment stock of product (and sub-products)
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
+                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
                         if ($result < 0) { $error++; }
                     }
                 }
@@ -564,7 +564,7 @@ class Commande extends CommonOrder
 					{
 						$mouvP = new MouvementStock($this->db);
 						// We increment stock of product (and sub-products)
-						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderCanceledInDolibarr",$this->ref));
+						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr",$this->ref));
 						if ($result < 0) {
 							$error++;
 						}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 72103f6ac5a..8044a677d69 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1751,7 +1751,7 @@ class Facture extends CommonInvoice
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
 							// We decrease stock for product
-							if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							if ($this->type == self::TYPE_CREDIT_NOTE) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr",$num));
 							else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
 							if ($result < 0) {
 								$error++;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2e591bf67be..e68b063d7d2 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -959,7 +959,7 @@ class Expedition extends CommonObject
 					$mouvS->origin = &$this;
 					// We decrement stock of product (and sub-products)
 					// We use warehouse selected for each line
-					$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice, $langs->trans("ShipmentDeletedInDolibarr",$this->ref));
+					$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr",$this->ref));
 					if ($result < 0)
 					{
 						$error++;

From 316b7453e47d247ca0af2ae56d8b12bafd86e7b1 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Thu, 5 Nov 2015 17:04:08 +0100
Subject: [PATCH 155/216] FIX bad stock valo

---
 htdocs/commande/class/commande.class.php      | 4 ++--
 htdocs/compta/facture/class/facture.class.php | 2 +-
 htdocs/expedition/class/expedition.class.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3485d50d729..d4465a43ff5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -367,7 +367,7 @@ class Commande extends CommonOrder
                     {
                         $mouvP = new MouvementStock($this->db);
                         // We increment stock of product (and sub-products)
-                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
+                        $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr",$this->ref));
                         if ($result < 0) { $error++; }
                     }
                 }
@@ -555,7 +555,7 @@ class Commande extends CommonOrder
 					{
 						$mouvP = new MouvementStock($this->db);
 						// We increment stock of product (and sub-products)
-						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderCanceledInDolibarr",$this->ref));
+						$result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr",$this->ref));
 						if ($result < 0) {
 							$error++;
 						}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 135280805cf..7e1ec7bacf8 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1796,7 +1796,7 @@ class Facture extends CommonInvoice
 						{
 							$mouvP = new MouvementStock($this->db);
 							// We decrease stock for product
-							if ($this->type == 2) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
+							if ($this->type == 2) $result=$mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr",$num));
 							else $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num));
 							if ($result < 0) {
 								$error++;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index fa25c48366d..92fb1f0c8a0 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -847,7 +847,7 @@ class Expedition extends CommonObject
 					$mouvS = new MouvementStock($this->db);
 					// We decrement stock of product (and sub-products)
 					// We use warehouse selected for each line
-					$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, $obj->subprice, $langs->trans("ShipmentDeletedInDolibarr",$this->ref));
+					$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr",$this->ref));
 					if ($result < 0)
 					{
 						$error++;

From 3ef6a92bb12a9ece66d512f3fd9dc8c64f72810f Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 18:04:00 +0100
Subject: [PATCH 156/216] Google Cloud Print

---
 .../modules/oauth/getgoogleoauthcallback.php  | 56 ++++++++++++++-----
 .../modules/printing/printgcp.modules.php     |  6 +-
 .../OAuth/Common/Storage/DoliStorage.php      | 33 +++++++----
 htdocs/printing/admin/printing.php            |  7 +++
 4 files changed, 77 insertions(+), 25 deletions(-)

diff --git a/htdocs/core/modules/oauth/getgoogleoauthcallback.php b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
index e514f6abe32..f1e0ddd03f3 100644
--- a/htdocs/core/modules/oauth/getgoogleoauthcallback.php
+++ b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
@@ -30,6 +30,8 @@ use OAuth\Common\Consumer\Credentials;
 use OAuth\Common\Token\TokenInterface;
 use OAuth\OAuth2\Service\Google;
 
+$action = GETPOST('action', 'alpha');
+
 /**
  * Create a new instance of the URI class with the current URI, stripping the query string
  */
@@ -59,45 +61,73 @@ $apiService = $serviceFactory->createService('Google', $credentials, $storage, a
 
 // access type needed for google refresh token
 $apiService->setAccessType('offline');
-//print '<pre>'.print_r($apiService,true).'</pre>';
-//print 'Has access Token: '.($storage->hasAccessToken('Google')?'Yes':'No').'</ br>';
-//print 'Has Author State: '.($storage->hasAuthorizationState('Google')?'Yes':'No').'</ br>';
-//print 'Authorization State: '.$storage->retrieveAuthorizationState('Google').'</ br>';
-//print '<td><pre>'.print_r($token,true).'</pre></td>';
-if (! empty($_GET['code'])) {
+if ($action == 'delete') {
+    // delete token
     llxHeader('',$langs->trans("OAuthSetup"));
 
     $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
     print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+    dol_fiche_head();
+    $storage->clearToken('Google');
+    dol_fiche_end();
+
+
+} elseif (! empty($_GET['code'])) {
+    llxHeader('',$langs->trans("OAuthSetup"));
+
+    $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+    print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+
+    dol_fiche_head();
     // retrieve the CSRF state parameter
     $state = isset($_GET['state']) ? $_GET['state'] : null;
+    print '<table>';
+    // looking for a token already stored in db
+    //try {
+    //    $token = $storage->retrieveAccessToken('Google');
+    //    $old_token=1;
+    //} catch (Exception $e) {
+    //    $old_token=0;
+    //}
+    //if ($old_token==1) {
+    //    print '<tr><td>'.$langs->trans('OldTokenStored').'</td><td></td></tr>';
+    //    print '<tr><td><pre>'.print_r($token,true).'</pre></td></tr>';
+    //}
+    //$refreshtoken = $token->getRefreshToken();
+
+    // This was a callback request from service, get the token
     try {
-        $token = $storage->retrieveAccessToken('Google');
+        $apiService->requestAccessToken($_GET['code'], $state);
     } catch (Exception $e) {
         print $e->getMessage();
     }
-    //print '<pre>'.print_r($token->getRefreshToken(),true).'</pre>';
-    //$refreshtoken = $token->getRefreshToken();
-    // This was a callback request from service, get the token
-    $apiService->requestAccessToken($_GET['code'], $state);
     //print '<pre>'.print_r($apiService,true).'</pre>';
 
+    // retrieve new token in db
     try {
         $token = $storage->retrieveAccessToken('Google');
+        $new_token=1;
     } catch (Exception $e) {
-        print $e->getMessage();
+        $new_token=0;
     }
     $newrefreshtoken = $token->getRefreshToken();
     if (empty($newrefreshtoken) && ! empty($refreshtoken)) {
         $token->setRefreshToken($refreshtoken);
         $storage->storeAccessToken('Google', $token);
     }
-    print '<td><pre>'.print_r($token,true).'</pre></td>';
+    if ($new_token==1) {
+        print '<tr><td>'.$langs->trans('NewTokenStored').'</td><td></td></tr>';
+        print '<tr><td><pre>'.print_r($token,true).'</pre></td></tr>';
+    }
+    //print '<td><pre>'.print_r($token,true).'</pre></td>';
     //$apiService->refreshAccessToken($token);
     //print '<pre>'.print_r($apiService,true).'</pre>';
     //$token = $storage->retrieveAccessToken('Google');
     //print '<td><pre>'.print_r($token,true).'</pre></td>';
+    print '<td><a href="https://security.google.com/settings/security/permissions" target="_blank">Applications associées à votre compte</a></td>';
+    print '</table>';
 
+    dol_fiche_end();
 } else {
     $url = $apiService->getAuthorizationUri();
     // we go on google authorization page
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 599a6645222..7010ec7de78 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -118,7 +118,11 @@ class printing_printgcp extends PrintingDriver
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info');
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(date("Y-m-d H:i:s", $token->getEndOfLife())), 'type'=>'info');
                 }
-                $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+                if (!$storage->hasAccessToken('Google')) {
+                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+                } else {
+                    $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete', 'type'=>'delete');
+                }
             } else {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
             }
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
index 7a46d106e66..2e4b9c195a2 100644
--- a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -138,14 +138,15 @@ class DoliStorage implements TokenStorageInterface
     {
         // TODO
         // get previously saved tokens
-        $tokens = $this->session->get($this->key);
+        //$tokens = $this->retrieveAccessToken($service);
 
-        if (is_array($tokens) && array_key_exists($service, $tokens)) {
-            unset($tokens[$service]);
+        //if (is_array($tokens) && array_key_exists($service, $tokens)) {
+        //    unset($tokens[$service]);
 
-            // Replace the stored tokens array
-            $this->conf->set($this->key, $tokens);
-        }
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token";
+            $sql.= " WHERE service='".$service."'";
+            $resql = $this->db->query($sql);
+        //}
 
         // allow chaining
         return $this;
@@ -182,8 +183,6 @@ class DoliStorage implements TokenStorageInterface
     public function storeAuthorizationState($service, $state)
     {
         // TODO save or update
-        // get previously saved tokens
-        //$states = $this->conf->get($this->stateKey);
 
         if (!is_array($states)) {
             $states = array();
@@ -192,10 +191,22 @@ class DoliStorage implements TokenStorageInterface
         $states[$service] = $state;
         $this->states[$service] = $state;
 
-        // save
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_state (service, state, entity)";
-        $sql.= " VALUES ('".$service."', '".$state."', 1)";
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_state";
+        $sql.= " WHERE service='".$service."' AND entity=1";
         $resql = $this->db->query($sql);
+        $obj = $this->db->fetch_array($resql);
+        if ($obj) {
+            // update
+            $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_state";
+            $sql.= " SET state='".$this->db->escape($state)."'";
+            $sql.= " WHERE rowid='".$obj['rowid']."'";
+            $resql = $this->db->query($sql);
+        } else {
+            // save
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_state (service, state, entity)";
+            $sql.= " VALUES ('".$service."', '".$state."', 1)";
+            $resql = $this->db->query($sql);
+        }
 
         // allow chaining
         return $this;
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 2f7e2f2da7f..ac6f030ae16 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -161,6 +161,13 @@ if ($mode == 'setup' && $user->admin)
                     print '<td>&nbsp;</td>';
                     print '</tr>'."\n";
                     break;
+                case "delete":
+                    print '<tr '.$bc[$var].'>';
+                    print '<td>'.$langs->trans($key['varname']).'</td>';
+                    print '<td class="button"><a href="'.$key['link'].'">'.$langs->trans('DeleteAccess').'</a></td>';
+                    print '<td>&nbsp;</td>';
+                    print '</tr>'."\n";
+                    break;
                 case "info":
                     print '<tr '.$bc[$var].'>';
                     print '<td'.($key['required']?' class=required':'').'>'.$langs->trans($key['varname']).'</td>';

From 89411541b3f84c7325839d46b59d0502f7e70ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Thu, 5 Nov 2015 18:49:22 +0100
Subject: [PATCH 157/216] Fix missing category selector

Complement to #3893
---
 htdocs/contrat/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 3751906d9fe..076d84c2194 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -190,7 +190,7 @@ if ($resql)
 	 	$moreforfilter.='</div>';
 	}
 	// If the user can view categories of products
-	if ($conf->categorie->enabled && $user->rights->produit->lire)
+	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">';

From f914873094c7a7e69f42db55056bdc8b074f9eb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 20:31:51 +0100
Subject: [PATCH 158/216] Better code generator

---
 dev/skeletons/build_class_from_table.php | 28 +++++++++++-
 dev/skeletons/skeleton_card.php          | 27 ++++++-----
 dev/skeletons/skeleton_class.class.php   | 57 ++++++++++++++++++++++++
 dev/skeletons/skeleton_list.php          |  4 +-
 4 files changed, 102 insertions(+), 14 deletions(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 33c83bcc356..65b6c023b89 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -561,7 +561,7 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     {
     	if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && ! $prop['istime'])
     	{
-    	    $varprop.="if (\$search_".$prop['field']." != '') \$params.= '&amp;search_".$prop['field']."='.urlencode(\$search_".$prop['field']."\n);";
+    	    $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);
@@ -619,6 +619,32 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     $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 and EDIT - 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=\"'.\$".$prop['field'].".'\"></td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_CREATE/', $varprop, $targetcontent);
+    $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.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>".$prop['field']."</td></tr>';\n";
+    	}
+    }
+    $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
+    
+    
     // Build file
     $fp=fopen($outfile,"w");
     if ($fp)
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index 8b643ff3f6c..9cf6f26440c 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -230,7 +230,7 @@ jQuery(document).ready(function() {
 // Part to create
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("NewSkeleton"));
+	print load_fiche_titre($langs->trans("NewMyModule"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="action" value="add">';
@@ -239,10 +239,8 @@ if ($action == 'create')
 	dol_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
-	print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-	print '<input class="flat" type="text" size="36" name="label" value="'.$label.'">';
-	print '</td></tr>';
-
+	// 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();
@@ -258,16 +256,20 @@ if ($action == 'create')
 if (($id || $ref) && $action == 'edit')
 {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-
-	dol_fiche_head();
-
 	print '<input type="hidden" name="action" value="add">';
 	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 '</td>';
+	
 	dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></div>';
+	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
 
 	print '</form>';
 }
@@ -279,8 +281,11 @@ if ($id && (empty($action) || $action == 'view'))
 {
 	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_VIEW
+	print '</td>';
+	
 	dol_fiche_end();
 
 
diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index 2d4aea97a5f..f9ef2d39f58 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -426,6 +426,63 @@ class Skeleton_Class extends CommonObject
 		}
 	}
 
+	
+	/**
+	 *  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);
+	}
+
+	/**
+	 *  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($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');
+		}
+	}
+	
+	
 	/**
 	 * Initialise object with example values
 	 * Id must be 0 if object instance is a specimen
diff --git a/dev/skeletons/skeleton_list.php b/dev/skeletons/skeleton_list.php
index e2452324d99..3018a23fdea 100644
--- a/dev/skeletons/skeleton_list.php
+++ b/dev/skeletons/skeleton_list.php
@@ -157,7 +157,7 @@ llxHeader('','MyPageName','');
 $form=new Form($db);
 
 // Put here content of your page
-print load_fiche_titre('PageTitle');
+$title = $langs->trans('MyModuleListTitle');
 
 // Example : Adding jquery code
 print '<script type="text/javascript" language="javascript">
@@ -310,7 +310,7 @@ if ($resql)
     print $hookmanager->resPrint;
 	if (! empty($arrayfields['t.datec']['checked']))  print_liste_field_titre($langs->trans("DateCreationShort"),$_SERVER["PHP_SELF"],"t.datec","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
 	if (! empty($arrayfields['t.tms']['checked']))    print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"t.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);
+	//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";
 

From 55dfa4859f1c2ca1b09910c15aea996ca6c9c2b0 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 21:09:14 +0100
Subject: [PATCH 159/216] Install lib with composer

---
 composer.json                                 |    1 +
 htdocs/admin/receiptprinter.php               |    4 +-
 htdocs/core/class/dolreceiptprinter.class.php |    2 +-
 htdocs/includes/escpos/.gitignore             |   12 -
 htdocs/includes/escpos/Escpos.php             |  851 ------
 htdocs/includes/escpos/LICENSE.md             |   27 -
 htdocs/includes/escpos/README.md              |  352 ---
 htdocs/includes/escpos/composer.json          |   36 -
 htdocs/includes/escpos/composer.lock          |  975 -------
 htdocs/includes/escpos/doc/Makefile           |    9 -
 htdocs/includes/escpos/doc/escpos.conf        | 2352 -----------------
 htdocs/includes/escpos/example/README.md      |   26 -
 htdocs/includes/escpos/example/barcode.php    |  181 --
 htdocs/includes/escpos/example/bit-image.php  |   32 -
 .../character-encodings-with-images.php       |   59 -
 .../escpos/example/character-encodings.php    |   58 -
 .../escpos/example/character-tables.php       |   71 -
 htdocs/includes/escpos/example/demo.php       |  167 --
 htdocs/includes/escpos/example/graphics.php   |   32 -
 .../escpos/example/interface/README.md        |    8 -
 .../escpos/example/interface/ethernet.php     |   22 -
 .../escpos/example/interface/linux-usb.php    |   33 -
 .../includes/escpos/example/interface/smb.php |   51 -
 .../escpos/example/interface/windows-lpt.php  |   30 -
 .../escpos/example/interface/windows-usb.php  |   32 -
 .../escpos/example/print-from-html.php        |   53 -
 .../escpos/example/print-from-pdf.php         |   71 -
 htdocs/includes/escpos/example/qr-code.php    |   81 -
 .../escpos/example/receipt-with-logo.php      |   96 -
 .../character-encoding-test-strings.inc       |   35 -
 .../escpos/example/resources/document.odt     |  Bin 39751 -> 0 bytes
 .../escpos/example/resources/document.pdf     |  Bin 24389 -> 0 bytes
 .../escpos/example/resources/document.z       |  Bin 20320 -> 0 bytes
 .../example/resources/escpos-php-small.png    |  Bin 1941 -> 0 bytes
 .../escpos/example/resources/escpos-php.png   |  Bin 7871 -> 0 bytes
 .../includes/escpos/example/resources/tux.png |  Bin 5198 -> 0 bytes
 .../specific/29-latvian-star-tup592.php       |   21 -
 .../32-german-tm-t20-ii-custom-command.php    |   36 -
 .../specific/33-spanish-seypos-prp-300.php    |   16 -
 .../example/specific/39-currency-symbols.php  |   69 -
 .../specific/44-pound-symbol-star-tsp650.php  |   31 -
 .../example/specific/50-P-822D-greek.php      |   16 -
 .../specific/6-arabic-epos-tep-220m.php       |   47 -
 .../escpos/example/specific/README.md         |    7 -
 htdocs/includes/escpos/example/text-size.php  |   62 -
 .../escpos/src/AbstractCapabilityProfile.php  |   61 -
 htdocs/includes/escpos/src/CodePage.php       |  181 --
 .../escpos/src/DefaultCapabilityProfile.php   |  103 -
 .../escpos/src/DummyPrintConnector.php        |   78 -
 .../escpos/src/EposTepCapabilityProfile.php   |    4 -
 htdocs/includes/escpos/src/EscposImage.php    |  405 ---
 .../includes/escpos/src/EscposPrintBuffer.php |  304 ---
 .../escpos/src/FilePrintConnector.php         |   80 -
 .../includes/escpos/src/ImagePrintBuffer.php  |   99 -
 .../escpos/src/NetworkPrintConnector.php      |   39 -
 .../escpos/src/P822DCapabilityProfile.php     |   90 -
 htdocs/includes/escpos/src/PrintBuffer.php    |   75 -
 htdocs/includes/escpos/src/PrintConnector.php |   56 -
 .../escpos/src/SimpleCapabilityProfile.php    |   17 -
 .../escpos/src/StarCapabilityProfile.php      |   82 -
 .../escpos/src/WindowsPrintConnector.php      |  356 ---
 ...Characters-DefaultCapabilityProfile.ser.gz |  Bin 12928 -> 0 bytes
 .../Characters-SimpleCapabilityProfile.ser.gz |  Bin 1116 -> 0 bytes
 .../Characters-StarCapabilityProfile.ser.gz   |  Bin 9416 -> 0 bytes
 htdocs/includes/escpos/test/bootstrap.php     |   27 -
 .../escpos/test/integration/ExampleTest.php   |  126 -
 .../integration/resources/output/barcode.bin  |  Bin 2342 -> 0 bytes
 .../resources/output/bit-image.bin            |  Bin 9789 -> 0 bytes
 .../resources/output/character-encodings.bin  |  Bin 1780 -> 0 bytes
 .../resources/output/character-tables.bin     |  Bin 8174 -> 0 bytes
 .../integration/resources/output/demo.bin     |  Bin 73643 -> 0 bytes
 .../integration/resources/output/graphics.bin |  Bin 9635 -> 0 bytes
 .../resources/output/interface.bin            |    2 -
 .../resources/output/print-from-pdf.bin.z     |  Bin 17081 -> 0 bytes
 .../integration/resources/output/qr-code.bin  |  Bin 1551 -> 0 bytes
 .../resources/output/receipt-with-logo.bin    |  Bin 9579 -> 0 bytes
 .../resources/output/text-size.bin            |  Bin 368 -> 0 bytes
 htdocs/includes/escpos/test/phpunit.xml       |   16 -
 .../unit/AbstractCapabilityProfileTest.php    |   69 -
 .../escpos/test/unit/EscposImageTest.php      |  235 --
 .../test/unit/EscposPrintBufferTest.php       |  150 --
 .../includes/escpos/test/unit/EscposTest.php  |  765 ------
 .../test/unit/WindowsPrintConnectorTest.php   |  252 --
 .../test/unit/resources/black_transparent.gif |  Bin 65 -> 0 bytes
 .../test/unit/resources/black_transparent.png |  Bin 167 -> 0 bytes
 .../test/unit/resources/black_white.bmp       |  Bin 138 -> 0 bytes
 .../test/unit/resources/black_white.gif       |  Bin 65 -> 0 bytes
 .../test/unit/resources/black_white.jpg       |  Bin 175 -> 0 bytes
 .../test/unit/resources/black_white.png       |  Bin 156 -> 0 bytes
 .../test/unit/resources/canvas_black.bmp      |  Bin 142 -> 0 bytes
 .../test/unit/resources/canvas_black.gif      |  Bin 72 -> 0 bytes
 .../test/unit/resources/canvas_black.jpg      |  Bin 160 -> 0 bytes
 .../test/unit/resources/canvas_black.png      |  Bin 239 -> 0 bytes
 .../test/unit/resources/canvas_white.bmp      |  Bin 142 -> 0 bytes
 .../test/unit/resources/canvas_white.gif      |  Bin 72 -> 0 bytes
 .../test/unit/resources/canvas_white.jpg      |  Bin 160 -> 0 bytes
 .../test/unit/resources/canvas_white.png      |  Bin 239 -> 0 bytes
 .../escpos/test/unit/resources/demo.php       |   19 -
 .../escpos/test/unit/resources/doc.pdf        |  Bin 6681 -> 0 bytes
 htdocs/includes/mike42/escpos-php             |    1 +
 100 files changed, 5 insertions(+), 9751 deletions(-)
 delete mode 100644 htdocs/includes/escpos/.gitignore
 delete mode 100644 htdocs/includes/escpos/Escpos.php
 delete mode 100644 htdocs/includes/escpos/LICENSE.md
 delete mode 100644 htdocs/includes/escpos/README.md
 delete mode 100644 htdocs/includes/escpos/composer.json
 delete mode 100644 htdocs/includes/escpos/composer.lock
 delete mode 100644 htdocs/includes/escpos/doc/Makefile
 delete mode 100644 htdocs/includes/escpos/doc/escpos.conf
 delete mode 100644 htdocs/includes/escpos/example/README.md
 delete mode 100644 htdocs/includes/escpos/example/barcode.php
 delete mode 100644 htdocs/includes/escpos/example/bit-image.php
 delete mode 100644 htdocs/includes/escpos/example/character-encodings-with-images.php
 delete mode 100644 htdocs/includes/escpos/example/character-encodings.php
 delete mode 100644 htdocs/includes/escpos/example/character-tables.php
 delete mode 100644 htdocs/includes/escpos/example/demo.php
 delete mode 100644 htdocs/includes/escpos/example/graphics.php
 delete mode 100644 htdocs/includes/escpos/example/interface/README.md
 delete mode 100644 htdocs/includes/escpos/example/interface/ethernet.php
 delete mode 100644 htdocs/includes/escpos/example/interface/linux-usb.php
 delete mode 100644 htdocs/includes/escpos/example/interface/smb.php
 delete mode 100644 htdocs/includes/escpos/example/interface/windows-lpt.php
 delete mode 100644 htdocs/includes/escpos/example/interface/windows-usb.php
 delete mode 100644 htdocs/includes/escpos/example/print-from-html.php
 delete mode 100644 htdocs/includes/escpos/example/print-from-pdf.php
 delete mode 100644 htdocs/includes/escpos/example/qr-code.php
 delete mode 100644 htdocs/includes/escpos/example/receipt-with-logo.php
 delete mode 100644 htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
 delete mode 100644 htdocs/includes/escpos/example/resources/document.odt
 delete mode 100644 htdocs/includes/escpos/example/resources/document.pdf
 delete mode 100644 htdocs/includes/escpos/example/resources/document.z
 delete mode 100644 htdocs/includes/escpos/example/resources/escpos-php-small.png
 delete mode 100644 htdocs/includes/escpos/example/resources/escpos-php.png
 delete mode 100644 htdocs/includes/escpos/example/resources/tux.png
 delete mode 100644 htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
 delete mode 100644 htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
 delete mode 100644 htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
 delete mode 100644 htdocs/includes/escpos/example/specific/39-currency-symbols.php
 delete mode 100644 htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
 delete mode 100644 htdocs/includes/escpos/example/specific/50-P-822D-greek.php
 delete mode 100644 htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
 delete mode 100644 htdocs/includes/escpos/example/specific/README.md
 delete mode 100644 htdocs/includes/escpos/example/text-size.php
 delete mode 100644 htdocs/includes/escpos/src/AbstractCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/CodePage.php
 delete mode 100644 htdocs/includes/escpos/src/DefaultCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/DummyPrintConnector.php
 delete mode 100644 htdocs/includes/escpos/src/EposTepCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/EscposImage.php
 delete mode 100644 htdocs/includes/escpos/src/EscposPrintBuffer.php
 delete mode 100644 htdocs/includes/escpos/src/FilePrintConnector.php
 delete mode 100644 htdocs/includes/escpos/src/ImagePrintBuffer.php
 delete mode 100644 htdocs/includes/escpos/src/NetworkPrintConnector.php
 delete mode 100644 htdocs/includes/escpos/src/P822DCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/PrintBuffer.php
 delete mode 100644 htdocs/includes/escpos/src/PrintConnector.php
 delete mode 100644 htdocs/includes/escpos/src/SimpleCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/StarCapabilityProfile.php
 delete mode 100644 htdocs/includes/escpos/src/WindowsPrintConnector.php
 delete mode 100644 htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz
 delete mode 100644 htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz
 delete mode 100644 htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz
 delete mode 100644 htdocs/includes/escpos/test/bootstrap.php
 delete mode 100644 htdocs/includes/escpos/test/integration/ExampleTest.php
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/barcode.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/bit-image.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/character-tables.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/demo.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/graphics.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/interface.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/qr-code.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin
 delete mode 100644 htdocs/includes/escpos/test/integration/resources/output/text-size.bin
 delete mode 100644 htdocs/includes/escpos/test/phpunit.xml
 delete mode 100644 htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
 delete mode 100644 htdocs/includes/escpos/test/unit/EscposImageTest.php
 delete mode 100644 htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
 delete mode 100644 htdocs/includes/escpos/test/unit/EscposTest.php
 delete mode 100644 htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_transparent.gif
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_transparent.png
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.bmp
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.gif
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.jpg
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/black_white.png
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.bmp
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.gif
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.jpg
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_black.png
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.bmp
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.gif
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.jpg
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/canvas_white.png
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/demo.php
 delete mode 100644 htdocs/includes/escpos/test/unit/resources/doc.pdf
 create mode 160000 htdocs/includes/mike42/escpos-php

diff --git a/composer.json b/composer.json
index 80e55b6a221..c5fab8bf290 100644
--- a/composer.json
+++ b/composer.json
@@ -17,6 +17,7 @@
         "ext-curl": "*",
         "ccampbell/chromephp": "^4.1",
         "ckeditor/ckeditor": "4.3.3",
+        "mike42/escpos-php": "dev-master",
         "mobiledetect/mobiledetectlib": "2.8.3",
         "phpoffice/phpexcel": "1.8.0",
         "restler/framework": "^3.0",
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index eb4a2da0570..794e7c83664 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -433,8 +433,8 @@ $object->vendor_firstname  = 'Jim';
 $object->vendor_lastname  = 'Big';
 
 $object->barcode = '3700123862396';
-$printer->sendToPrinter($object, 1, 16);
-setEventMessages($printer->error, $printer->errors, 'errors');
+//$printer->sendToPrinter($object, 1, 16);
+//setEventMessages($printer->error, $printer->errors, 'errors');
 
 llxFooter();
 
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 5afb24fe43e..064cf130426 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -92,7 +92,7 @@
  *
  */
 
-require_once DOL_DOCUMENT_ROOT .'/includes/escpos/Escpos.php';
+require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
 
  
 /**
diff --git a/htdocs/includes/escpos/.gitignore b/htdocs/includes/escpos/.gitignore
deleted file mode 100644
index 0e8fc4a31ee..00000000000
--- a/htdocs/includes/escpos/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-# Eclipse files
-.settings/*
-.project
-.buildpath
-
-# doxygen files
-doc/html
-doc/latex
-doc/doxygen_sqlite3.db
-
-# composer files
-vendor/
diff --git a/htdocs/includes/escpos/Escpos.php b/htdocs/includes/escpos/Escpos.php
deleted file mode 100644
index 57e7eb2c8ac..00000000000
--- a/htdocs/includes/escpos/Escpos.php
+++ /dev/null
@@ -1,851 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- * 
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- * 
- * 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.
- * 
- * This class generates ESC/POS printer control commands for compatible printers.
- * See README.md for a summary of compatible printers and supported commands, and
- * basic usage.
- * 
- * See example/demo.php for a detailed print-out demonstrating the range of commands
- * implemented in this project.
- * 
- * Note that some functions have not been implemented:
- * 		- Set paper sensors
- * 		- Select print colour
- * 
- * Please direct feature requests, bug reports and contributions to escpos-php
- * on Github:
- * 		- https://github.com/mike42/escpos-php
- */
-require_once(dirname(__FILE__) . "/src/EscposImage.php");
-require_once(dirname(__FILE__) . "/src/PrintBuffer.php");
-require_once(dirname(__FILE__) . "/src/EscposPrintBuffer.php");
-require_once(dirname(__FILE__) . "/src/PrintConnector.php");
-require_once(dirname(__FILE__) . "/src/WindowsPrintConnector.php");
-require_once(dirname(__FILE__) . "/src/FilePrintConnector.php");
-require_once(dirname(__FILE__) . "/src/NetworkPrintConnector.php");
-require_once(dirname(__FILE__) . "/src/AbstractCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/DefaultCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/SimpleCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/EposTepCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/StarCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/P822DCapabilityProfile.php");
-require_once(dirname(__FILE__) . "/src/CodePage.php");
-require_once(dirname(__FILE__) . "/src/ImagePrintBuffer.php");
-
-class Escpos {
-	/* ASCII codes */
-	const NUL = "\x00";
-	const LF = "\x0a";
-	const ESC = "\x1b";
-	const FS = "\x1c";
-	const FF = "\x0c";
-	const GS = "\x1d";
-	const DLE = "\x10";
-	const EOT = "\x04";
-
-	/* Barcode types */
-	const BARCODE_UPCA = 65;
-	const BARCODE_UPCE = 66;
-	const BARCODE_JAN13 = 67;
-	const BARCODE_JAN8 = 68;
-	const BARCODE_CODE39 = 69;
-	const BARCODE_ITF = 70;
-	const BARCODE_CODABAR = 71;
-	const BARCODE_CODE93 = 72;
-	const BARCODE_CODE128 = 73;
-	
-	/* Barcode HRI (human-readable interpretation) text position */
-	const BARCODE_TEXT_NONE = 0;
-	const BARCODE_TEXT_ABOVE = 1;
-	const BARCODE_TEXT_BELOW = 2;
-	
-	/* Cut types */
-	const CUT_FULL = 65;
-	const CUT_PARTIAL = 66;
-	
-	/* Fonts */
-	const FONT_A = 0;
-	const FONT_B = 1;
-	const FONT_C = 2;
-	
-	/* Image sizing options */
-	const IMG_DEFAULT = 0;
-	const IMG_DOUBLE_WIDTH = 1;
-	const IMG_DOUBLE_HEIGHT = 2;
-	
-	/* Justifications */
-	const JUSTIFY_LEFT = 0;
-	const JUSTIFY_CENTER = 1;
-	const JUSTIFY_RIGHT = 2;
-	
-	/* Print mode constants */
-	const MODE_FONT_A = 0;
-	const MODE_FONT_B = 1;
-	const MODE_EMPHASIZED = 8;
-	const MODE_DOUBLE_HEIGHT = 16;
-	const MODE_DOUBLE_WIDTH = 32;
-	const MODE_UNDERLINE = 128;
-	
-	/* QR code error correction levels */
-	const QR_ECLEVEL_L = 0;
-	const QR_ECLEVEL_M = 1;
-	const QR_ECLEVEL_Q = 2;
-	const QR_ECLEVEL_H = 3;
-	
-	/* QR code models */
-	const QR_MODEL_1 = 1;
-	const QR_MODEL_2 = 2;
-	const QR_MICRO = 3;
-	
-	/* Printer statuses */
-	const STATUS_PRINTER = 1;
-	const STATUS_OFFLINE_CAUSE = 2;
-	const STATUS_ERROR_CAUSE = 3;
-	const STATUS_PAPER_ROLL = 4;
-	const STATUS_INK_A = 7;
-	const STATUS_INK_B = 6;
-	const STATUS_PEELER = 8;
-	
-	/* Underline */
-	const UNDERLINE_NONE = 0;
-	const UNDERLINE_SINGLE = 1;
-	const UNDERLINE_DOUBLE = 2;
-	
-	/**
-	 * @var PrintBuffer The printer's output buffer.
-	 */
-	private $buffer;
-	
-	/**
-	 * @var PrintConnector
-	 */
-	private $connector;
-
-	/**
-	 * @var AbstractCapabilityProfile
-	 */
-	private $profile;
-	
-	/**
-	 * @var int Current character code table
-	 */
-	private $characterTable;
-
-	/**
-	 * Construct a new print object
-	 *
-	 * @param PrintConnector $connector The PrintConnector to send data to. If not set, output is sent to standard output.
-	 * @param AbstractCapabilityProfile $profile Supported features of this printer. If not set, the DefaultCapabilityProfile will be used, which is suitable for Epson printers.
-	 * @throws InvalidArgumentException
-	 */
-	function __construct(PrintConnector $connector = null, AbstractCapabilityProfile $profile = null) {
-		if(is_null($connector)) {
-			if(php_sapi_name() == 'cli') {
-				$connector = new FilePrintConnector("php://stdout");
-			} else {
-				throw new InvalidArgumentException("Argument passed to Escpos::__construct() must implement interface PrintConnector, null given.");
-			}
-		}
-		/* Set connector */
-		$this -> connector = $connector;
-		
-		/* Set capability profile */
-		if($profile === null) {
-			$profile = DefaultCapabilityProfile::getInstance();
-		}
-		$this -> profile = $profile;
-		/* Set buffer */
-		$buffer = new EscposPrintBuffer();
-		$this -> buffer = null;
-		$this -> setPrintBuffer($buffer);
-		$this -> initialize();
-	}
-	
-	/**
-	 * Print a barcode.
-	 *
-	 * @param string $content The information to encode.
-	 * @param int $type The barcode standard to output. If not specified, `Escpos::BARCODE_CODE39` will be used. Note that some barcode formats only support specific lengths or sets of characters.
-	 * @throws InvalidArgumentException Where the length or characters used in $content is invalid for the requested barcode format.
-	 */
-	function barcode($content, $type = self::BARCODE_CODE39) {
-		/* Validate input */
-		self::validateInteger($type, 65, 73, __FUNCTION__, "Barcode type");
-		$len = strlen($content);
-		switch($type) {
-			case self::BARCODE_UPCA:
-				self::validateInteger($len, 11, 12, __FUNCTION__, "UPCA barcode content length");
-				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{11,12}$/", "UPCA barcode content");
-				break;
-			case self::BARCODE_UPCE:
-				self::validateIntegerMulti($len, array(array(6, 8), array(11, 12)), __FUNCTION__, "UPCE barcode content length");
-				self::validateStringRegex($content, __FUNCTION__, "/^([0-9]{6,8}|[0-9]{11,12})$/",  "UPCE barcode content");
-				break;
-			case self::BARCODE_JAN13:
-				self::validateInteger($len, 12, 13, __FUNCTION__, "JAN13 barcode content length");
-				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{12,13}$/", "JAN13 barcode content");
-				break;
-			case self::BARCODE_JAN8:
-				self::validateInteger($len, 7, 8, __FUNCTION__, "JAN8 barcode content length");
-				self::validateStringRegex($content, __FUNCTION__, "/^[0-9]{7,8}$/", "JAN8 barcode content");
-				break;
-			case self::BARCODE_CODE39:
-				self::validateInteger($len, 1, 255, __FUNCTION__, "CODE39 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
-				self::validateStringRegex($content, __FUNCTION__, "/^([0-9A-Z \$\%\+\-\.\/]+|\*[0-9A-Z \$\%\+\-\.\/]+\*)$/", "CODE39 barcode content");
-				break;
-			case self::BARCODE_ITF:
-				self::validateInteger($len, 2, 255, __FUNCTION__, "ITF barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
-				self::validateStringRegex($content, __FUNCTION__, "/^([0-9]{2})+$/", "ITF barcode content");
-				break;
-			case self::BARCODE_CODABAR:
-				self::validateInteger($len, 1, 255, __FUNCTION__, "Codabar barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
-				self::validateStringRegex($content, __FUNCTION__, "/^[A-Da-d][0-9\$\+\-\.\/\:]+[A-Da-d]$/", "Codabar barcode content");
-				break;
-			case self::BARCODE_CODE93:
-				self::validateInteger($len, 1, 255, __FUNCTION__, "Code93 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
-				self::validateStringRegex($content, __FUNCTION__, "/^[\\x00-\\x7F]+$/", "Code93 barcode content");
-				break;
-			case self::BARCODE_CODE128:
-				self::validateInteger($len, 1, 255, __FUNCTION__, "Code128 barcode content length"); // 255 is a limitation of the "function b" command, not the barcode format.
-				// The CODE128 encoder is quite complex, so only a very basic header-check is applied here.
-				self::validateStringRegex($content, __FUNCTION__, "/^\{[A-C][\\x00-\\x7F]+$/", "Code128 barcode content");
-				break;
-		}
- 		if(!$this -> profile -> getSupportsBarcodeB()) {
-			// A simpler barcode command which supports fewer codes
-			self::validateInteger($type, 65, 71, __FUNCTION__);
-			$this -> connector -> write(self::GS . "k" . chr($type - 65) . $content . self::NUL);
-			return;
- 		}
- 		// More advanced function B, used in preference
- 		$this -> connector -> write(self::GS . "k" . chr($type) . chr(strlen($content)) . $content);
-	}
-	
-	/**
-	 * Print an image, using the older "bit image" command. This creates padding on the right of the image,
-	 * if its width is not divisible by 8.
-	 * 
-	 * Should only be used if your printer does not support the graphics() command.
-	 * 
-	 * @param EscposImage $img The image to print
-	 * @param EscposImage $size Size modifier for the image.
-	 */
-	function bitImage(EscposImage $img, $size = self::IMG_DEFAULT) {
-		self::validateInteger($size, 0, 3, __FUNCTION__);
-		$header = self::dataHeader(array($img -> getWidthBytes(), $img -> getHeight()), true);
-		$this -> connector -> write(self::GS . "v0" . chr($size) . $header);
-		$this -> connector -> write($img -> toRasterFormat());
-	}
-	
-	/**
-	 * Close the underlying buffer. With some connectors, the
-	 * job will not actually be sent to the printer until this is called.
-	 */
-	function close() {
-		$this -> connector -> finalize();
-	}
-	
-	/**
-	 * Cut the paper.
-	 *
-	 * @param int $mode Cut mode, either Escpos::CUT_FULL or Escpos::CUT_PARTIAL. If not specified, `Escpos::CUT_FULL` will be used.
-	 * @param int $lines Number of lines to feed
-	 */
-	function cut($mode = self::CUT_FULL, $lines = 3) {
-		// TODO validation on cut() inputs
-		$this -> connector -> write(self::GS . "V" . chr($mode) . chr($lines));
-	}
-	
-	/**
-	 * Print and feed line / Print and feed n lines.
-	 * 
-	 * @param int $lines Number of lines to feed
-	 */
-	function feed($lines = 1) {
-		self::validateInteger($lines, 1, 255, __FUNCTION__);
-		if($lines <= 1) {
-			$this -> connector -> write(self::LF);
-		} else {
-			$this -> connector -> write(self::ESC . "d" . chr($lines));
-		}
-	}
-
-	/**
-	 * Some printers require a form feed to release the paper. On most printers, this 
-	 * command is only useful in page mode, which is not implemented in this driver.
-	 */
-	function feedForm() {
-		$this -> connector -> write(self::FF);	
-	}
-
-	/**
-	 * Print and reverse feed n lines.
-	 *
-	 * @param int $lines number of lines to feed. If not specified, 1 line will be fed.
-	 */
-	function feedReverse($lines = 1) {
-		self::validateInteger($lines, 1, 255, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "e" . chr($lines));
-	}
-
-	/**
-	 * @return number
-	 */
-	function getCharacterTable() {
-		return $this -> characterTable;
-	}
-	
-	/**
-	 * @return PrintBuffer
-	 */
-	function getPrintBuffer() {
-		return $this -> buffer;
-	}
-
-	/**
-	 * @return PrintConnector
-	 */
-	function getPrintConnector() {
-		return $this -> connector;
-	}
-
-	/**
-	 * @return AbstractCapabilityProfile
-	 */
-	function getPrinterCapabilityProfile() {
-		return $this -> profile;
-	}
-
-	/**
-	 * @param int $type The type of status to request
-	 * @return stdClass Class containing requested status, or null if either no status was received, or your print connector is unable to read from the printer.
-	 */
-	function getPrinterStatus($type = self::STATUS_PRINTER) {
-		self::validateIntegerMulti($type, array(array(1, 4), array(6, 8)), __FUNCTION__);
-		// Determine which flags we are looking for
-		$statusFlags = array(
-				self::STATUS_PRINTER => array(
-					4 => "pulseHigh", // connector pin 3, see pulse().
-					8 => "offline",
-					32 => "waitingForOnlineRecovery",
-					64 => "feedButtonPressed"
-				),
-				self::STATUS_OFFLINE_CAUSE => array(
-					4 => "coverOpen",
-					8 => "paperManualFeed",
-					32 => "paperEnd",
-					64 => "errorOccurred"
-				),
-				self::STATUS_ERROR_CAUSE => array(
-					4 => "recoverableError",
-					8 => "autocutterError",
-					32 => "unrecoverableError",
-					64 => "autorecoverableError"
-				),
-				self::STATUS_PAPER_ROLL => array(
-					4 => "paperNearEnd",
-					32 => "paperNotPresent"
-				),
-				self::STATUS_INK_A => array(
-					4 => "inkNearEnd",
-					8 => "inkEnd",
-					32 => "inkNotPresent",
-					64 => "cleaning"
-				),
-				self::STATUS_INK_B => array(
-					4 => "inkNearEnd",
-					8 => "inkEnd",
-					32 => "inkNotPresent"
-				),
-				self::STATUS_PEELER => array(
-					4 => "labelWaitingForRemoval",
-					32 => "labelPaperNotDetected"
-				)
-		);
-		$flags = $statusFlags[$type];
-		// Clear any previous statuses which haven't been read yet
-		$f = $this -> connector -> read(1);
-		// Make request
-		$reqC = chr($type);
-		switch($type) {
-			// Special cases: These are two-character requests
-			case self::STATUS_INK_A:
-				$reqC = chr(7) . chr(1);
-				break;
-			case self::STATUS_INK_B:
-				$reqC = chr(7) . chr(2);
-				break;
-			case self::STATUS_PEELER:
-				$reqC = chr(8) . chr(3);
-				break;
-		}
-		$this -> connector -> write(self::DLE . self::EOT . $reqC);
-		// Wait for single-character response
-		$f = $this -> connector -> read(1);
-		$i = 0;
-		while($f === false && $i < 50000) {
-			usleep(100);
-			$f = $this -> connector -> read(1);
-			$i++;
-		}
-		if($f === false) {
-			// Timeout
-			return null;
-		}
-		$ret = new stdClass();
-		foreach($flags as $num => $name) {
-			$ret -> $name = (ord($f) & $num) != 0;
-		}
-		return $ret;
-	}
-	
-	/**
-	 * Print an image to the printer.
-	 * 
-	 * Size modifiers are:
-	 * - IMG_DEFAULT (leave image at original size)
-	 * - IMG_DOUBLE_WIDTH
-	 * - IMG_DOUBLE_HEIGHT
-	 * 
-	 * See the example/ folder for detailed examples.
-	 * 
-	 * The function bitImage() takes the same parameters, and can be used if
-	 * your printer doesn't support the newer graphics commands.
-	 * 
-	 * @param EscposImage $img The image to print.
-	 * @param int $size Output size modifier for the image.
-	 */
-	function graphics(EscposImage $img, $size = self::IMG_DEFAULT) {
-		self::validateInteger($size, 0, 3, __FUNCTION__);
-		$imgHeader = self::dataHeader(array($img -> getWidth(), $img -> getHeight()), true);
-		$tone = '0';
-		$colors = '1';
-		$xm = (($size & self::IMG_DOUBLE_WIDTH) == self::IMG_DOUBLE_WIDTH) ? chr(2) : chr(1);
-		$ym = (($size & self::IMG_DOUBLE_HEIGHT) == self::IMG_DOUBLE_HEIGHT) ? chr(2) : chr(1);
-		$header = $tone . $xm . $ym . $colors . $imgHeader;
-		$this -> wrapperSendGraphicsData('0', 'p', $header . $img -> toRasterFormat());
-		$this -> wrapperSendGraphicsData('0', '2');
-	}
-	
-	/**
-	 * Initialize printer. This resets formatting back to the defaults.
-	 */
-	function initialize() {
-		$this -> connector -> write(self::ESC . "@");
-		$this -> characterTable = 0;
-	}
-	
-	/**
-	 * Generate a pulse, for opening a cash drawer if one is connected.
-	 * The default settings should open an Epson drawer.
-	 *
-	 * @param int $pin 0 or 1, for pin 2 or pin 5 kick-out connector respectively.
-	 * @param int $on_ms pulse ON time, in milliseconds.
-	 * @param int $off_ms pulse OFF time, in milliseconds.
-	 */
-	function pulse($pin = 0, $on_ms = 120, $off_ms = 240) {
-		self::validateInteger($pin, 0, 1, __FUNCTION__);
-		self::validateInteger($on_ms, 1, 511, __FUNCTION__);
-		self::validateInteger($off_ms, 1, 511, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "p" . chr($pin + 48) . chr($on_ms / 2) . chr($off_ms / 2));
-	}
-	
-	/**
-	 * Print the given data as a QR code on the printer.
-	 * 
-	 * @param string $content The content of the code. Numeric data will be more efficiently compacted.
-	 * @param int $ec Error-correction level to use. One of Escpos::QR_ECLEVEL_L (default), Escpos::QR_ECLEVEL_M, Escpos::QR_ECLEVEL_Q or Escpos::QR_ECLEVEL_H. Higher error correction results in a less compact code.
-	 * @param int $size Pixel size to use. Must be 1-16 (default 3)
-	 * @param int $model QR code model to use. Must be one of Escpos::QR_MODEL_1, Escpos::QR_MODEL_2 (default) or Escpos::QR_MICRO (not supported by all printers).
-	 */
-	function qrCode($content, $ec = self::QR_ECLEVEL_L, $size = 3, $model = self::QR_MODEL_2) {
-		self::validateString($content, __FUNCTION__);
-		self::validateInteger($ec, 0, 3, __FUNCTION__);
-		self::validateInteger($size, 1, 16, __FUNCTION__);
-		self::validateInteger($model, 1, 3, __FUNCTION__);
-		if($content == "") {
-			return;
-		}
-		if(!$this -> profile -> getSupportsQrCode()) {
-			// TODO use software rendering via phpqrcode instead
-			throw new Exception("QR codes are not supported on your printer.");
-		}
-		$cn = '1'; // Code type for QR code
-		// Select model: 1, 2 or micro.
-		$this -> wrapperSend2dCodeData(chr(65), $cn, chr(48 + $model) . chr(0));
-		// Set dot size.
-		$this -> wrapperSend2dCodeData(chr(67), $cn, chr($size));
-		// Set error correction level: L, M, Q, or H
-		$this -> wrapperSend2dCodeData(chr(69), $cn, chr(48 + $ec));
-		// Send content & print
-		$this -> wrapperSend2dCodeData(chr(80), $cn, $content, '0');
-		$this -> wrapperSend2dCodeData(chr(81), $cn, '', '0');
-	}
-
-	/**
-	 * Switch character table (code page) manually. Used in conjunction with textRaw() to
-	 * print special characters which can't be encoded automatically.
-	 * 
-	 * @param int $table The table to select. Available code tables are model-specific.
-	 */
-	function selectCharacterTable($table = 0) {
-		self::validateInteger($table, 0, 255, __FUNCTION__);
-		$supported = $this -> profile -> getSupportedCodePages();
-		if(!isset($supported[$table])) {
-			throw new InvalidArgumentException("There is no code table $table allowed by this printer's capability profile.");
-		}
-		$this -> characterTable = $table;
-		if($this -> profile -> getSupportsStarCommands()) {
-			/* Not an ESC/POS command: STAR printers stash all the extra code pages under a different command. */
-			$this -> connector -> write(self::ESC . self::GS . "t" . chr($table));
-			return;
-		}
-		$this -> connector -> write(self::ESC . "t" . chr($table));
-	}
-
-	/**
-	 * Select print mode(s).
-	 * 
-	 * Several MODE_* constants can be OR'd together passed to this function's `$mode` argument. The valid modes are:
-	 *  - MODE_FONT_A
-	 *  - MODE_FONT_B
-	 *  - MODE_EMPHASIZED
-	 *  - MODE_DOUBLE_HEIGHT
-	 *  - MODE_DOUBLE_WIDTH
-	 *  - MODE_UNDERLINE
-	 * 
-	 * @param int $mode The mode to use. Default is Escpos::MODE_FONT_A, with no special formatting. This has a similar effect to running initialize().
-	 */
-	function selectPrintMode($mode = self::MODE_FONT_A) {
-		$allModes = self::MODE_FONT_B | self::MODE_EMPHASIZED | self::MODE_DOUBLE_HEIGHT | self::MODE_DOUBLE_WIDTH | self::MODE_UNDERLINE;
-		if(!is_integer($mode) || $mode < 0 || ($mode & $allModes) != $mode) {
-			throw new InvalidArgumentException("Invalid mode");
-		}
-
-		$this -> connector -> write(self::ESC . "!" . chr($mode));
-	}
-	
-	/**
-	 * Set barcode height.
-	 *
-	 * @param int $height Height in dots. If not specified, 8 will be used.
-	 */
-	function setBarcodeHeight($height = 8) {
-		self::validateInteger($height, 1, 255, __FUNCTION__);
-		$this -> connector -> write(self::GS . "h" . chr($height));
-	}
-	
-	
-	/**
-	 * Set the position for the Human Readable Interpretation (HRI) of barcode characters.
-	 * 
-	 * @param position $position. Use Escpos::BARCODE_TEXT_NONE to hide the text (default), or any combination of Escpos::BARCODE_TEXT_TOP and Escpos::BARCODE_TEXT_BOTTOM flags to display the text.
-	 */
-	function setBarcodeTextPosition($position = self::BARCODE_TEXT_NONE) {
-		self::validateInteger($position, 0, 3, __FUNCTION__, "Barcode text position");
-		$this -> connector -> write(self::GS . "H" . chr($position));
-	}
-	
-	/**
-	 * Turn double-strike mode on/off.
-	 *
-	 * @param boolean $on true for double strike, false for no double strike
-	 */
-	function setDoubleStrike($on = true) {
-		self::validateBoolean($on, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "G". ($on ? chr(1) : chr(0)));
-	}
-	
-	/**
-	 * Turn emphasized mode on/off.
-	 *
-	 *  @param boolean $on true for emphasis, false for no emphasis
-	 */
-	function setEmphasis($on = true) {
-		self::validateBoolean($on, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "E". ($on ? chr(1) : chr(0)));
-	}
-	
-	/**
-	 * Select font. Most printers have two fonts (Fonts A and B), and some have a third (Font C).
-	 *
-	 * @param int $font The font to use. Must be either Escpos::FONT_A, Escpos::FONT_B, or Escpos::FONT_C.
-	 */
-	function setFont($font = self::FONT_A) {
-		self::validateInteger($font, 0, 2, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "M" . chr($font));
-	}
-	
-	/**
-	 * Select justification.
-	 *
-	 * @param int $justification One of Escpos::JUSTIFY_LEFT, Escpos::JUSTIFY_CENTER, or Escpos::JUSTIFY_RIGHT.
-	 */
-	function setJustification($justification = self::JUSTIFY_LEFT) {
-		self::validateInteger($justification, 0, 2, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "a" . chr($justification));
-	}
-	
-	/**
-	 * Attach a different print buffer to the printer. Buffers are responsible for handling text output to the printer.
-	 * 
-	 * @param PrintBuffer $buffer The buffer to use.
-	 * @throws InvalidArgumentException Where the buffer is already attached to a different printer.
-	 */
-	function setPrintBuffer(PrintBuffer $buffer) {
-		if($buffer === $this -> buffer) {
-			return;
-		}
-		if($buffer -> getPrinter() != null) {
-			throw new InvalidArgumentException("This buffer is already attached to a printer.");
-		}
-		if($this -> buffer !== null) {
-			$this -> buffer -> setPrinter(null);
-		}
-		$this -> buffer = $buffer;
-		$this -> buffer -> setPrinter($this);
-	}
-	
-	/**
-	 * Set black/white reverse mode on or off. In this mode, text is printed white on a black background.
-	 * 
-	 * @param boolean $on True to enable, false to disable.
-	 */
-	function setReverseColors($on = true) {
-		self::validateBoolean($on, __FUNCTION__);
-		$this -> connector -> write(self::GS . "B" . ($on ? chr(1) : chr(0)));
-	}
-
-	/**
-	 * Set the size of text, as a multiple of the normal size.
-	 * 
-	 * @param int $widthMultiplier Multiple of the regular height to use (range 1 - 8)
-	 * @param int $heightMultiplier Multiple of the regular height to use (range 1 - 8)
-	 */
-	function setTextSize($widthMultiplier, $heightMultiplier) {
-		self::validateInteger($widthMultiplier, 1, 8, __FUNCTION__);
-		self::validateInteger($heightMultiplier, 1, 8, __FUNCTION__);
-		$c = pow(2,4) * ($widthMultiplier - 1) + ($heightMultiplier - 1);		
-		$this -> connector -> write(self::GS . "!" . chr($c));
-	}
-
-	/**
-	 * Set underline for printed text.
-	 * 
-	 * Argument can be true/false, or one of UNDERLINE_NONE,
-	 * UNDERLINE_SINGLE or UNDERLINE_DOUBLE.
-	 * 
-	 * @param int $underline Either true/false, or one of Escpos::UNDERLINE_NONE, Escpos::UNDERLINE_SINGLE or Escpos::UNDERLINE_DOUBLE. Defaults to Escpos::UNDERLINE_SINGLE.
-	 */
-	function setUnderline($underline = self::UNDERLINE_SINGLE) {
-		/* Map true/false to underline constants */
-		if($underline === true) {
-			$underline = self::UNDERLINE_SINGLE;
-		} else if($underline === false) {
-			$underline = self::UNDERLINE_NONE;
-		}
-		/* Set the underline */
-		self::validateInteger($underline, 0, 2, __FUNCTION__);
-		$this -> connector -> write(self::ESC . "-". chr($underline));
-	}
-	
-	/**
-	 * Add text to the buffer.
-	 *
-	 * Text should either be followed by a line-break, or feed() should be called
-	 * after this to clear the print buffer.
-	 *
-	 * @param string $str Text to print
-	 */
-	function text($str = "") {
-		self::validateString($str, __FUNCTION__);
-		$this -> buffer -> writeText((string)$str);
-	}
-	
-	/**
-	 * Add text to the buffer without attempting to interpret chararacter codes.
-	 *
-	 * Text should either be followed by a line-break, or feed() should be called
-	 * after this to clear the print buffer.
-	 *
-	 * @param string $str Text to print
-	 */
-	function textRaw($str = "") {
-		self::validateString($str, __FUNCTION__);
-		$this -> buffer -> writeTextRaw((string)$str);
-	}
-	
-	/**
-	 * Wrapper for GS ( k, to calculate and send correct data length.
-	 * 
-	 * @param string $fn Function to use
-	 * @param string $cn Output code type. Affects available data
-	 * @param string $data Data to send.
-	 * @param string $m Modifier/variant for function. Often '0' where used.
-	 * @throws InvalidArgumentException Where the input lengths are bad.
-	 */
-	private function wrapperSend2dCodeData($fn, $cn, $data = '', $m = '') {
-		if(strlen($m) > 1 || strlen($cn) != 1 || strlen($fn) != 1) {
-			throw new InvalidArgumentException("wrapperSend2dCodeData: cn and fn must be one character each.");
-		}
-		$header = $this -> intLowHigh(strlen($data) + strlen($m) + 2, 2);
-		$this -> connector -> write(self::GS . "(k" . $header . $cn . $fn . $m . $data);
-	}
-	
-	/**
-	 * Wrapper for GS ( L, to calculate and send correct data length.
-	 *
-	 * @param string $m Modifier/variant for function. Usually '0'.
-	 * @param string $fn Function number to use, as character.
-	 * @param string $data Data to send.
-	 * @throws InvalidArgumentException Where the input lengths are bad.
-	 */
-	private function wrapperSendGraphicsData($m, $fn, $data = '') {
-		if(strlen($m) != 1 || strlen($fn) != 1) {
-			throw new InvalidArgumentException("wrapperSendGraphicsData: m and fn must be one character each.");
-		}
-		$header = $this -> intLowHigh(strlen($data) + 2, 2);
-		$this -> connector -> write(self::GS . "(L" . $header . $m . $fn . $data);
-	}
-	
-	/**
-	 * Convert widths and heights to characters. Used before sending graphics to set the size.
-	 * 
-	 * @param array $inputs
-	 * @param boolean $long True to use 4 bytes, false to use 2
-	 * @return string
-	 */
-	private static function dataHeader(array $inputs, $long = true) {
-		$outp = array();
-		foreach($inputs as $input) {
-			if($long) {
-				$outp[] = Escpos::intLowHigh($input, 2);
-			} else {
-				self::validateInteger($input, 0 , 255, __FUNCTION__);
-				$outp[] = chr($input);
-			}
-		}
-		return implode("", $outp);
-	}
-	
-	/**
-	 * Generate two characters for a number: In lower and higher parts, or more parts as needed.
-	 * @param int $int Input number
-	 * @param int $length The number of bytes to output (1 - 4).
-	 */
-	private static function intLowHigh($input, $length) {
-		$maxInput = (256 << ($length * 8) - 1);
-		self::validateInteger($length, 1, 4, __FUNCTION__);
-		self::validateInteger($input, 0, $maxInput, __FUNCTION__);
-		$outp = "";
-		for($i = 0; $i < $length; $i++) {
-			$outp .= chr($input % 256);
-			$input = (int)($input / 256);
-		}
-		return $outp;
-	}
-	
-	/**
-	 * Throw an exception if the argument given is not a boolean
-	 * 
-	 * @param boolean $test the input to test
-	 * @param string $source the name of the function calling this
-	 */
-	protected static function validateBoolean($test, $source) {
-		if(!($test === true || $test === false)) {
-			throw new InvalidArgumentException("Argument to $source must be a boolean");
-		}
-	}
-	
-	/**
-	 * Throw an exception if the argument given is not an integer within the specified range
-	 * 
-	 * @param int $test the input to test
-	 * @param int $min the minimum allowable value (inclusive)
-	 * @param int $max the maximum allowable value (inclusive)
-	 * @param string $source the name of the function calling this
-	 * @param string $argument the name of the invalid parameter
-	 */
-	protected static function validateInteger($test, $min, $max, $source, $argument = "Argument") {
-		self::validateIntegerMulti($test, array(array($min, $max)), $source, $argument);
-	}
-	
-	/**
-	 * Throw an exception if the argument given is not an integer within one of the specified ranges
-	 *
-	 * @param int $test the input to test
-	 * @param arrray $ranges array of two-item min/max ranges.
-	 * @param string $source the name of the function calling this
-	 * @param string $source the name of the function calling this
-	 * @param string $argument the name of the invalid parameter
-	 */
-	protected static function validateIntegerMulti($test, array $ranges, $source, $argument = "Argument") {
-		if(!is_integer($test)) {
-			throw new InvalidArgumentException("$argument given to $source must be a number, but '$test' was given.");
-		}
-		$match = false;
-		foreach($ranges as $range) {
-			$match |= $test >= $range[0] && $test <= $range[1];
-		}
-		if(!$match) {
-			// Put together a good error "range 1-2 or 4-6"
-			$rangeStr = "range ";
-			for($i = 0; $i < count($ranges); $i++) {
-				$rangeStr .= $ranges[$i][0] . "-" . $ranges[$i][1];
-				if($i == count($ranges) - 1) {
-					continue;
-				} else if($i == count($ranges) - 2) {
-					$rangeStr .= " or ";
-				} else {
-					$rangeStr .= ", ";
-				}
-			}
-			throw new InvalidArgumentException("$argument given to $source must be in $rangeStr, but $test was given.");
-		}
-	}
-	
-	/**
-	 * Throw an exception if the argument given can't be cast to a string
-	 *
-	 * @param string $test the input to test
-	 * @param string $source the name of the function calling this
-	 * @param string $argument the name of the invalid parameter
-	 */
-	protected static function validateString($test, $source, $argument = "Argument") {
-		if (is_object($test) && !method_exists($test, '__toString')) {
-			throw new InvalidArgumentException("$argument to $source must be a string");
-		}
-	}
-	
-	protected static function validateStringRegex($test, $source, $regex, $argument = "Argument") {
-		if(preg_match($regex, $test) === 0) {
-			throw new InvalidArgumentException("$argument given to $source is invalid. It should match regex '$regex', but '$test' was given.");
-		}
-	}
-}
diff --git a/htdocs/includes/escpos/LICENSE.md b/htdocs/includes/escpos/LICENSE.md
deleted file mode 100644
index a0bebf6920b..00000000000
--- a/htdocs/includes/escpos/LICENSE.md
+++ /dev/null
@@ -1,27 +0,0 @@
-escpos-php, a Thermal receipt printer library, for use with
-ESC/POS compatible printers.
-
-Copyright (c) 2014-15 Michael Billington <michael.billington@gmail.com>,
-incorporating modifications by:
-- Roni Saha <roni.cse@gmail.com>
-- Gergely Radics <gerifield@ustream.tv>
-- Warren Doyle <w.doyle@fuelled.co>
-
-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/escpos/README.md b/htdocs/includes/escpos/README.md
deleted file mode 100644
index 43798bb0852..00000000000
--- a/htdocs/includes/escpos/README.md
+++ /dev/null
@@ -1,352 +0,0 @@
-ESC/POS Print Driver for PHP
-============================
-This project implements a subset of Epson's ESC/POS protocol for thermal receipt printers. It allows you to generate and print receipts with basic formatting, cutting, and barcodes on a compatible printer.
-
-The library was developed to add drop-in support for receipt printing to any PHP app, including web-based point-of-sale (POS) applications.
-
-Basic usage
------------
-A "hello world" receipt can be generated easily (Call this `hello-world.php`):
-```php
-<?php
-require_once(dirname(__FILE__) . "/Escpos.php");
-$printer = new Escpos();
-$printer -> text("Hello World!\n");
-$printer -> cut();
-$printer -> close();
-```
-This would be printed as:
-```
-# Networked printer
-php hello-world.php | nc 10.x.x.x. 9100
-# Local printer
-php hello-world.php > /dev/...
-# Windows local printer
-php hello-world.php > foo.txt
-net use LPT1 \\server\printer
-copy foo.txt LPT1
-del foo.txt
-```
-
-From your web app, you could pass the output directly to a socket if your printer is networked:
-```php
-<?php
-require_once(dirname(__FILE__) . "/Escpos.php");
-$connector = new NetworkPrintConnector("10.x.x.x", 9100);
-$printer = new Escpos($connector);
-$printer -> text("Hello World!\n");
-$printer -> cut();
-$printer -> close();
-```
-
-Or to a local printer:
-```php
-<?php
-require_once(dirname(__FILE__) . "/Escpos.php");
-$connector = new FilePrintConnector("/dev/ttyS0");
-$printer = new Escpos($connector);
-$printer -> text("Hello World!\n");
-$printer -> cut();
-$printer -> close();
-```
-
-### Basic workflow
-The library should be initialised with a PrintConnector, which will pass on the data to your printer.
-Use the table under "Compatibility", or the examples below to choose the appropriate connector for your
-platform & interface. If no connector is specified, then standard output is used.
-
-When you have finished using the print object, call `close()` to finalize any data transfers.
-
-### Tips & examples
-On Linux, your printer device file will be somewhere like `/dev/lp0` (parallel), `/dev/usb/lp1` (USB), `/dev/ttyUSB0` (USB-Serial), `/dev/ttyS0` (serial).
-
-On Windows, the device files will be along the lines of `LPT1` (parallel) or `COM1` (serial). Use the `WindowsPrintConnector` to tap into system printing on Windows (eg. [Windows USB](https://github.com/mike42/escpos-php/tree/master/example/interface/windows-usb.php), [SMB](https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php) or [Windows LPT](https://github.com/mike42/escpos-php/tree/master/example/interface/windows-lpt.php)) - this submits print jobs via a queue rather than communicating directly with the printer.
-
-A complete real-world receipt can be found in the code of [Auth](https://github.com/mike42/Auth) in [ReceiptPrinter.php](https://github.com/mike42/Auth/blob/master/lib/misc/ReceiptPrinter.php). It includes justification, boldness, and a barcode.
-
-Other examples are located in the [example/](https://github.com/mike42/escpos-php/blob/master/example/) directory.
-
-Compatibility
--------------
-
-### Interfaces and operating systems
-This driver is known to work with the following OS/interface combinations:
-
-<table>
-<tr>
-<th>&nbsp;</th>
-<th>Linux</th>
-<th>Mac</th>
-<th>Windows</th>
-</tr>
-<tr>
-<th>Ethernet</th>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/ethernet.php">Yes</a></td>
-</tr>
-<tr>
-<th>USB</th>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/linux-usb.php">Yes</a></td>
-<td>Not tested</td>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/windows-usb.php">Yes</a></td>
-</tr>
-<tr>
-<th>USB-serial</th>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<th>Serial</th>
-<td>Yes</td>
-<td>Yes</td>
-<td>Yes</td>
-</tr>
-<tr>
-<th>Parallel</th>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/windows-lpt.php">Yes</a></td>
-<td>Not tested</td>
-<td>Yes</td>
-</tr>
-<tr>
-<th>SMB shared</th>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php">Yes</a></td>
-<td>No</td>
-<td><a href="https://github.com/mike42/escpos-php/tree/master/example/interface/smb.php">Yes</a></td>
-</tr>
-</table>
-
-### Printers
-Many thermal receipt printers support ESC/POS to some degree. This driver has been known to work with:
-
-- EPOS TEP 220M
-- Epson TM-T88III
-- Epson TM-T88IV
-- Epson TM-T70
-- Epson TM-T82II
-- Epson TM-T20
-- Epson TM-T70II
-- Epson TM-U220
-- Epson FX-890 (requires `feedForm()` to release paper).
-- Okipos 80 Plus III
-- P-822D
-- SEYPOS PRP-300 (Also marketed as TYSSO PRP-300)
-- Star TSP-650
-- Star TUP-592
-- Xprinter XP-Q800
-- Zijang NT-58H
-- Zijang ZJ-5870
-- Zijang ZJ-5890T (Marketed as POS 5890T)
-
-If you use any other printer with this code, please let me know so I can add it to the list.
-
-Available methods
------------------
-
-### __construct(PrintConnector $connector, AbstractCapabilityProfile $profile)
-Construct new print object.
-
-Parameters:
-- `PrintConnector $connector`: The PrintConnector to send data to. If not set, output is sent to standard output.
-- `AbstractCapabilityProfile $profile` Supported features of this printer. If not set, the DefaultCapabilityProfile will be used, which is suitable for Epson printers.
-
-See [example/interface/]("https://github.com/mike42/escpos-php/tree/master/example/interface/) for ways to open connections for different platforms and interfaces.
-
-### barcode($content, $type)
-Print a barcode.
-
-Parameters:
-
-- `string $content`: The information to encode.
-- `int $type`: The barcode standard to output. If not specified, `Escpos::BARCODE_CODE39` will be used.
-
-Currently supported barcode standards are (depending on your printer):
-
-- `BARCODE_UPCA`
-- `BARCODE_UPCE`
-- `BARCODE_JAN13`
-- `BARCODE_JAN8`
-- `BARCODE_CODE39`
-- `BARCODE_ITF`
-- `BARCODE_CODABAR`
-
-Note that some barcode standards can only encode numbers, so attempting to print non-numeric codes with them may result in strange behaviour.
-
-### bitImage(EscposImage $image, $size)
-See [graphics()](#graphicsescposimage-image-size) below.
-
-### cut($mode, $lines)
-Cut the paper.
-
-Parameters:
-
-- `int $mode`: Cut mode, either `Escpos::CUT_FULL` or `Escpos::CUT_PARTIAL`. If not specified, `Escpos::CUT_FULL` will be used.
-- `int $lines`: Number of lines to feed before cutting. If not specified, 3 will be used.
-
-### feed($lines)
-Print and feed line / Print and feed n lines.
-
-Parameters:
-
-- `int $lines`: Number of lines to feed
-
-### feedForm()
-Some printers require a form feed to release the paper. On most printers, this command is only useful in page mode, which is not implemented in this driver.
-
-### feedReverse($lines)
-Print and reverse feed n lines.
-
-Parameters:
-
-- `int $lines`: number of lines to feed. If not specified, 1 line will be fed.
-
-### graphics(EscposImage $image, $size)
-Print an image to the printer.
-
-Parameters:
-
-- `EscposImage $img`: The image to print.
-- `int $size`: Output size modifier for the image.
-
-Size modifiers are:
-
-- `IMG_DEFAULT` (leave image at original size)
-- `IMG_DOUBLE_WIDTH`
-- `IMG_DOUBLE_HEIGHT`
-
-A minimal example:
-
-```php
-<?php
-$img = new EscposImage("logo.png");
-$printer -> graphics($img);
-```
-
-See the [example/](https://github.com/mike42/escpos-php/blob/master/example/) folder for detailed examples.
-
-The function [bitImage()](#bitimageescposimage-image-size) takes the same parameters, and can be used if your printer doesn't support the newer graphics commands.
-
-### initialize()
-Initialize printer. This resets formatting back to the defaults.
-
-### pulse($pin, $on_ms, $off_ms)
-Generate a pulse, for opening a cash drawer if one is connected. The default settings (0, 120, 240) should open an Epson drawer.
-
-Parameters:
-
-- `int $pin`: 0 or 1, for pin 2 or pin 5 kick-out connector respectively.
-- `int $on_ms`: pulse ON time, in milliseconds.
-- `int $off_ms`: pulse OFF time, in milliseconds.
-
-### qrCode($content, $ec, $size, $model)
-Print the given data as a QR code on the printer.
-
-- `string $content`: The content of the code. Numeric data will be more efficiently compacted.
-- `int $ec` Error-correction level to use. One of `Escpos::QR_ECLEVEL_L` (default), `Escpos::QR_ECLEVEL_M`, `Escpos::QR_ECLEVEL_Q` or `Escpos::QR_ECLEVEL_H`. Higher error correction results in a less compact code.
-- `int $size`: Pixel size to use. Must be 1-16 (default 3)
-- `int $model`: QR code model to use. Must be one of `Escpos::QR_MODEL_1`, `Escpos::QR_MODEL_2` (default) or `Escpos::QR_MICRO` (not supported by all printers).
-
-### selectPrintMode($mode)
-Select print mode(s).
-
-Parameters:
-
-- `int $mode`: The mode to use. Default is `Escpos::MODE_FONT_A`, with no special formatting. This has a similar effect to running `initialize()`.
-
-Several MODE_* constants can be OR'd together passed to this function's `$mode` argument. The valid modes are:
-
-- `MODE_FONT_A`
-- `MODE_FONT_B`
-- `MODE_EMPHASIZED`
-- `MODE_DOUBLE_HEIGHT`
-- `MODE_DOUBLE_WIDTH`
-- `MODE_UNDERLINE`
-
-### setBarcodeHeight($height)
-Set barcode height.
-
-Parameters:
-
-- `int $height`: Height in dots. If not specified, 8 will be used.
-
-### setDoubleStrike($on)
-Turn double-strike mode on/off.
-
-Parameters:
-
-- `boolean $on`: true for double strike, false for no double strike.
-
-### setEmphasis($on)
-Turn emphasized mode on/off.
-
-Parameters:
-
-- `boolean $on`: true for emphasis, false for no emphasis.
-
-### setFont($font)
-Select font. Most printers have two fonts (Fonts A and B), and some have a third (Font C).
-
-Parameters:
-
-- `int $font`: The font to use. Must be either `Escpos::FONT_A`, `Escpos::FONT_B`, or `Escpos::FONT_C`.
-
-### setJustification($justification)
-Select justification.
-
-Parameters:
-
-- `int $justification`: One of `Escpos::JUSTIFY_LEFT`, `Escpos::JUSTIFY_CENTER`, or `Escpos::JUSTIFY_RIGHT`.
-
-### setReverseColors($on)
-Set black/white reverse mode on or off. In this mode, text is printed white on a black background.
-
-Parameters:
-
-- `boolean $on`: True to enable, false to disable.
-
-### setTextSize($widthMultiplier, $heightMultiplier)
-Set the size of text, as a multiple of the normal size.
-
-Parameters:
-
-- `int $widthMultiplier`: Multiple of the regular height to use (range 1 - 8).
-- `int $heightMultiplier`: Multiple of the regular height to use (range 1 - 8).
-
-### setUnderline($underline)
-Set underline for printed text.
-
-Parameters:
-
-- `int $underline`: Either `true`/`false`, or one of `Escpos::UNDERLINE_NONE`, `Escpos::UNDERLINE_SINGLE` or `Escpos::UNDERLINE_DOUBLE`. Defaults to `Escpos::UNDERLINE_SINGLE`.
-
-### text($str)
-Add text to the buffer. Text should either be followed by a line-break, or `feed()` should be called after this.
-
-Parameters:
-
-- `string $str`: The string to print.
-
-Further notes
--------------
-Posts I've written up for people who are learning how to use receipt printers:
-
-* [What is ESC/POS, and how do I use it?](http://mike.bitrevision.com/blog/what-is-escpos-and-how-do-i-use-it), which documents the output of test.php.
-* [Setting up an Epson receipt printer](http://mike.bitrevision.com/blog/2014-20-26-setting-up-an-epson-receipt-printer)
-* [Getting a USB receipt printer working on Linux](http://mike.bitrevision.com/blog/2015-03-getting-a-usb-receipt-printer-working-on-linux)
-
-Other versions
---------------
-Some forks of this project have been developed by others for specific use cases. Improvements from the following projects have been incorporated into escpos-php:
-
-- [wdoyle/EpsonESCPOS-PHP](https://github.com/wdoyle/EpsonESCPOS-PHP)
-- [ronisaha/php-esc-pos](https://github.com/ronisaha/php-esc-pos)
-
-Vendor documentation
---------------------
-Epson notes that not all of its printers support all ESC/POS features, and includes a table in their documentation:
-
-* [FAQ about ESC/POS from Epson](http://content.epson.de/fileadmin/content/files/RSD/downloads/escpos.pdf)
-
-Note that many printers produced by other vendors use the same standard, and are compatible by varying degrees.
-
diff --git a/htdocs/includes/escpos/composer.json b/htdocs/includes/escpos/composer.json
deleted file mode 100644
index 8ec2e6b215f..00000000000
--- a/htdocs/includes/escpos/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"name": "mike42/escpos-php",
-	"type": "library",
-	"description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
-	"homepage": "https://github.com/mike42/escpos-php",
-	"keywords": ["receipt", "print", "escpos", "ESC-POS", "driver"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "Michael Billington",
-			"email": "michael.billington@gmail.com"
-		},
-		{
-			"name": "Roni Saha",
-			"email": "roni.cse@gmail.com"
-		},
-		{
-			"name": "Gergely Radics",
-			"email": "gerifield@ustream.tv"
-		},
-		{
-			"name": "Warren Doyle",
-			"email": "w.doyle@fuelled.co"
-		},
-		{
-			"name": "vharo",
-			"email": "vharo@geepok.com"
-		}
-	],
-	"require": {
-		"php": ">=5.3.0"
-	},
-	"require-dev": {
-	    "phpunit/phpunit": "4.5.*"
-	}
-}
diff --git a/htdocs/includes/escpos/composer.lock b/htdocs/includes/escpos/composer.lock
deleted file mode 100644
index ab6911c281d..00000000000
--- a/htdocs/includes/escpos/composer.lock
+++ /dev/null
@@ -1,975 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "fd25f2b816df83dabf03fe7259ad4018",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Instantiator\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2014-10-13 12:58:55"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2015-02-03 12:10:50"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
-                "reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0",
-                "sebastian/comparator": "~1.1"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2015-03-27 19:31:25"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.0.15",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-01-24 10:06:35"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "File/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2013-10-10 15:34:57"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Text/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2014-01-30 17:20:04"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHP/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2013-08-02 07:42:54"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-01-17 09:51:32"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
-                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
-                "phpunit/php-file-iterator": "~1.3.2",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.2",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.5.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-03-29 09:24:05"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
-                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-04-02 05:36:41"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-01-29 16:28:08"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "http://www.github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-02-22 15:13:53"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
-                "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2015-01-01 10:01:08"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "84839970d05254c73cde183a721c7af13aede943"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
-                "reference": "84839970d05254c73cde183a721c7af13aede943",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2015-01-27 07:23:06"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2014-10-06 09:23:50"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-01-24 09:48:32"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
-                "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-02-24 06:35:25"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.6.6",
-            "target-dir": "Symfony/Component/Yaml",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
-                "reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\Yaml\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-03-30 15:54:10"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.3.0"
-    },
-    "platform-dev": []
-}
diff --git a/htdocs/includes/escpos/doc/Makefile b/htdocs/includes/escpos/doc/Makefile
deleted file mode 100644
index fed323f0cff..00000000000
--- a/htdocs/includes/escpos/doc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-html: ../Escpos.php escpos.conf
-	doxygen escpos.conf
-
-latex: html
-	# Do nothing
-
-clean:
-	rm --preserve-root -Rf html latex doxygen_sqlite3.db
-
diff --git a/htdocs/includes/escpos/doc/escpos.conf b/htdocs/includes/escpos/doc/escpos.conf
deleted file mode 100644
index 01c76dc422a..00000000000
--- a/htdocs/includes/escpos/doc/escpos.conf
+++ /dev/null
@@ -1,2352 +0,0 @@
-# Doxyfile 1.8.8
-
-# 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           = "escpos-php"
-
-# 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         =
-
-# 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          =
-
-# With the PROJECT_LOGO tag one can specify an logo or 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           = ../example/images/escpos-php-small.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       =
-
-# 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         = NO
-
-# 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    = NO
-
-# 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           = YES
-
-# 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      = NO
-
-# 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 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 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
-
-# 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        = NO
-
-# 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         = NO
-
-# 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. When 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   = NO
-
-# 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     = NO
-
-# 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       = YES
-
-# 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 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        = YES
-
-# 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       = 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           =
-
-#---------------------------------------------------------------------------
-# 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.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ../Escpos.php ../src/ ../README.md
-
-# 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. 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, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          =
-
-# 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              = NO
-
-# 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                =
-
-# 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       = NO
-
-# 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       =
-
-# 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             =
-
-# 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.
-
-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.
-
-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 = ../README.md
-
-#---------------------------------------------------------------------------
-# 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         = NO
-
-# 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 = NO
-
-# 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    = NO
-
-# 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
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-#---------------------------------------------------------------------------
-# 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            = html
-
-# 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 therefor more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra stylesheet files is of importance (e.g. the last
-# stylesheet 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 stylesheet 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 NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# 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  = NO
-
-# 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.doxygen.Publisher
-
-# 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  = Publisher
-
-# 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   = NO
-
-# 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 stylesheets (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
-
-# When 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 prerendered 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           = YES
-
-# 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 hosted 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         = YES
-
-# 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. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# 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 empy string,
-# for the replacement values of the other commands the user is refered 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_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
-
-#---------------------------------------------------------------------------
-# 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    =
-
-#---------------------------------------------------------------------------
-# 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   = YES
-
-# 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     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes 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         = YES
-
-# 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   = YES
-
-# 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: YES.
-
-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           = Helvetica
-
-# 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           = YES
-
-# 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.
-# 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.
-# 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.
-# 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, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
-# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# 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        = NO
-
-# 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.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-PLANTUML_JAR_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    = 50
-
-# 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        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES 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/includes/escpos/example/README.md b/htdocs/includes/escpos/example/README.md
deleted file mode 100644
index 68b0dc77e7c..00000000000
--- a/htdocs/includes/escpos/example/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Examples
---------
-
-This folder contains a collectoion of feature examples.
-Generally, demo.php is the fastest way to find out which features your
-printer supports.
-
-## Subfolders
-- `interface/` - contains examples for output interfaces: eg, parallel, serial, USB, network, file-based.
-- `specific/` - examples made in response to issues & questions. These cover specific languages, printers and interfaces, so hit narrower use cases.
-
-## List of examples
-
-Each example prints to standard output, so either edit the print connector, or redirect the output to your printer to see it in action. They are designed for developers: open them in a text editor before you run them!
-
-- `bit-image.php` - Prints a images to the printer using the older "bit image" commands.
-- `demo.php` - Demonstrates output using a large subset of availale features.
-- `qr-code.php` - Prints QR codes, if your printer supports it.
-- `character-encodings.php` - Shows available character encodings. Change from the DefaultCapabilityProfile to get more useful output for your specific printer.
-- `graphics.php` - The same output as `bit-image.php`, printed with the newer graphics commands (not supported on many non-Epson printers)
-- `receipt-with-logo.php` - A simple receipt containing a logo and basic formating.
-- `character-encodings-with-images.php` - The same as `character-encodings.php`, but also prints each string using an `ImagePrintBuffer`, showing compatibility gaps.
-- `print-from-html.php` - Runs `wkhtmltoimage` to convert HTML to an image, and then prints the image. (This is very slow)
-- `character-tables.php` - Prints a compact character code table for each available character set. Used to debug incorrect output from `character-encodings.php`.
-- `print-from-pdf.php` - Loads a PDF and prints each page in a few different ways (very slow as well)
-
diff --git a/htdocs/includes/escpos/example/barcode.php b/htdocs/includes/escpos/example/barcode.php
deleted file mode 100644
index 5475b76c19d..00000000000
--- a/htdocs/includes/escpos/example/barcode.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-require_once (dirname ( __FILE__ ) . "/../Escpos.php");
-$printer = new Escpos ();
-$printer->setBarcodeHeight ( 40 );
-
-/* Text position */
-$printer->selectPrintMode ( Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH );
-$printer->text ( "Text position\n" );
-$printer->selectPrintMode ();
-$hri = array (
-		Escpos::BARCODE_TEXT_NONE => "No text",
-		Escpos::BARCODE_TEXT_ABOVE => "Above",
-		Escpos::BARCODE_TEXT_BELOW => "Below",
-		Escpos::BARCODE_TEXT_ABOVE | Escpos::BARCODE_TEXT_BELOW => "Both" 
-);
-foreach ( $hri as $position => $caption ) {
-	$printer->text ( $caption . "\n" );
-	$printer->setBarcodeTextPosition ( $position );
-	$printer->barcode ( "012345678901", Escpos::BARCODE_JAN13 );
-	$printer->feed ();
-}
-
-/* Barcode types */
-$standards = array (
-		Escpos::BARCODE_UPCA => array (
-				"title" => "UPC-A",
-				"caption" => "Fixed-length numeric product barcodes.",
-				"example" => array (
-						array (
-								"caption" => "12 char numeric including (wrong) check digit.",
-								"content" => "012345678901"
-						),
-						array (
-								"caption" => "Send 11 chars to add check digit automatically.",
-								"content" => "01234567890" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_UPCE => array (
-				"title" => "UPC-E",
-				"caption" => "Fixed-length numeric compact product barcodes.",
-				"example" => array (
-						array (
-								"caption" => "6 char numeric - auto check digit & NSC",
-								"content" => "123456" 
-						),
-						array (
-								"caption" => "7 char numeric - auto check digit",
-								"content" => "0123456"
-						),
-						array (
-								"caption" => "8 char numeric",
-								"content" => "01234567"
-						),
-						array (
-								"caption" => "11 char numeric - auto check digit",
-								"content" => "01234567890"
-						),
-						array (
-								"caption" => "12 char numeric including (wrong) check digit",
-								"content" => "012345678901"
-						) 
-				) 
-		),
-		Escpos::BARCODE_JAN13 => array (
-				"title" => "JAN13/EAN13",
-				"caption" => "Fixed-length numeric barcodes.",
-				"example" => array (
-						array (
-								"caption" => "12 char numeric - auto check digit",
-								"content" => "012345678901" 
-						),
-						array (
-								"caption" => "13 char numeric including (wrong) check digit",
-								"content" => "0123456789012" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_JAN8 => array (
-				"title" => "JAN8/EAN8",
-				"caption" => "Fixed-length numeric barcodes.",
-				"example" => array (
-						array (
-								"caption" => "7 char numeric - auto check digit",
-								"content" => "0123456" 
-						),
-						array (
-								"caption" => "8 char numeric including (wrong) check digit",
-								"content" => "01234567"
-						) 
-				) 
-		),
-		Escpos::BARCODE_CODE39 => array (
-				"title" => "Code39",
-				"caption" => "Variable length alphanumeric w/ some special chars.",
-				"example" => array (
-						array (
-								"caption" => "Text, numbers, spaces",
-								"content" => "ABC 012" 
-						),
-						array (
-								"caption" => "Special characters",
-								"content" => "$%+-./" 
-						),
-						array (
-								"caption" => "Extra char (*) Used as start/stop",
-								"content" => "*TEXT*" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_ITF => array (
-				"title" => "ITF",
-				"caption" => "Variable length numeric w/even number of digits,\nas they are encoded in pairs.",
-				"example" => array (
-						array (
-								"caption" => "Numeric- even number of digits",
-								"content" => "0123456789" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_CODABAR => array (
-				"title" => "Codabar",
-				"caption" => "Varaible length numeric with some allowable\nextra characters. ABCD/abcd must be used as\nstart/stop characters (one at the start, one\nat the end) to distinguish between barcode\napplications.",
-				"example" => array (
-						array (
-								"caption" => "Numeric w/ A A start/stop. ",
-								"content" => "A012345A" 
-						),
-						array (
-								"caption" => "Extra allowable characters",
-								"content" => "A012$+-./:A" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_CODE93 => array (
-				"title" => "Code93",
-				"caption" => "Variable length- any ASCII is available",
-				"example" => array (
-						array (
-								"caption" => "Text",
-								"content" => "012abcd" 
-						) 
-				) 
-		),
-		Escpos::BARCODE_CODE128 => array (
-				"title" => "Code128",
-				"caption" => "Variable length- any ASCII is available",
-				"example" => array (
-						array (
-								"caption" => "Code set A uppercase & symbols",
-								"content" => "{A" . "012ABCD" 
-						),
-						array (
-								"caption" => "Code set B general text",
-								"content" => "{B" . "012ABCDabcd" 
-						),
-						array (
-								"caption" => "Code set C compact numbers\n Sending chr(21) chr(32) chr(43)",
-								"content" => "{C" . chr ( 21 ) . chr ( 32 ) . chr ( 43 ) 
-						) 
-				) 
-		) 
-);
-$printer->setBarcodeTextPosition ( Escpos::BARCODE_TEXT_BELOW );
-foreach ( $standards as $type => $standard ) {
-	$printer->selectPrintMode ( Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH );
-	$printer->text ( $standard ["title"] . "\n" );
-	$printer->selectPrintMode ();
-	$printer->text ( $standard ["caption"] . "\n\n" );
-	foreach ( $standard ["example"] as $id => $barcode ) {
-		$printer->setEmphasis ( true );
-		$printer->text ( $barcode ["caption"] . "\n" );
-		$printer->setEmphasis ( false );
-		$printer->text ( "Content: " . $barcode ["content"] . "\n" );
-		$printer->barcode ( $barcode ["content"], $type );
-		$printer->feed ();
-	}
-}
-$printer->cut ();
-$printer->close ();
-
diff --git a/htdocs/includes/escpos/example/bit-image.php b/htdocs/includes/escpos/example/bit-image.php
deleted file mode 100644
index f3a4054d98f..00000000000
--- a/htdocs/includes/escpos/example/bit-image.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* Example print-outs using the older bit image print command */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-$printer = new Escpos();
-
-try {
-	$tux = new EscposImage("resources/tux.png");
-
-	$printer -> text("These example images are printed with the older\nbit image print command. You should only use\n\$p -> bitImage() if \$p -> graphics() does not\nwork on your printer.\n\n");
-	
-	$printer -> bitImage($tux);
-	$printer -> text("Regular Tux (bit image).\n");
-	$printer -> feed();
-	
-	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_WIDTH);
-	$printer -> text("Wide Tux (bit image).\n");
-	$printer -> feed();
-	
-	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_HEIGHT);
-	$printer -> text("Tall Tux (bit image).\n");
-	$printer -> feed();
-	
-	$printer -> bitImage($tux, Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT);
-	$printer -> text("Large Tux in correct proportion (bit image).\n");
-} catch(Exception $e) {
-	/* Images not supported on your PHP, or image file not found */
-	$printer -> text($e -> getMessage() . "\n");
-}
-
-$printer -> cut();
-$printer -> close();
-?>
diff --git a/htdocs/includes/escpos/example/character-encodings-with-images.php b/htdocs/includes/escpos/example/character-encodings-with-images.php
deleted file mode 100644
index a98bdbc96ae..00000000000
--- a/htdocs/includes/escpos/example/character-encodings-with-images.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-
-/**
- * This example builds on character-encodings.php, also providing an image-based rendering.
- * This is quite slow, since a) the buffers are changed dozens of
- * times in the example, and b) It involves sending very wide images, which printers don't like!
- * 
- * There are currently no test cases around the image printing, since it is an experimental feature.
- *
- * It does, however, illustrate the way that more encodings are available when image output is used.
- */
-include(dirname(__FILE__) . '/resources/character-encoding-test-strings.inc');
-
-try {
-	// Enter connector and capability profile
-	$connector = new FilePrintConnector("php://stdout");
-	$profile = DefaultCapabilityProfile::getInstance();
-	$buffers = array(new EscposPrintBuffer(), new ImagePrintBuffer());
-
-	/* Print a series of receipts containing i18n example strings */
-	$printer = new Escpos($connector, $profile);
-	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
-	$printer -> text("Implemented languages\n");
-	$printer -> selectPrintMode();
-	foreach($inputsOk as $label => $str) {
-		$printer -> setEmphasis(true);
-		$printer -> text($label . ":\n");
-		$printer -> setEmphasis(false);
-		foreach($buffers as $buffer) {
-			$printer -> setPrintBuffer($buffer);
-			$printer -> text($str);
-		}
-		$printer -> setPrintBuffer($buffers[0]);
-	}
-	$printer -> feed();
-	
-	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
-	$printer -> text("Works in progress\n");
-	$printer -> selectPrintMode();
-	foreach($inputsNotOk as $label => $str) {
-		$printer -> setEmphasis(true);
-		$printer -> text($label . ":\n");
-		$printer -> setEmphasis(false);
-		foreach($buffers as $buffer) {
-			$printer -> setPrintBuffer($buffer);
-			$printer -> text($str);
-		}
-		$printer -> setPrintBuffer($buffers[0]);
-	}
-	$printer -> cut();
-
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
-
diff --git a/htdocs/includes/escpos/example/character-encodings.php b/htdocs/includes/escpos/example/character-encodings.php
deleted file mode 100644
index 8a42ecd0847..00000000000
--- a/htdocs/includes/escpos/example/character-encodings.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-
-/**
- * This demonstrates available character encodings. Escpos-php accepts UTF-8,
- * and converts this to lower-level data to the printer. This is a complex area, so be
- * prepared to code a model-specific hack ('CapabilityProfile') for your printer.
- * 
- * If you run into trouble, please file an issue on GitHub, including at a minimum:
- * - A UTF-8 test string in the language you're working in, and
- * - A test print or link to a technical document which lists the available
- *      code pages ('character code tables') for your printer.
- * 
- * The DefaultCapabilityProfile works for Espson-branded printers. For other models, you
- * must use/create a PrinterCapabilityProfile for your printer containing a list of code
- * page numbers for your printer- otherwise you will get mojibake.
- * 
- * If you do not intend to use non-English characters, then use SimpleCapabilityProfile,
- * which has only the default encoding, effectively disabling code page changes.
- */
-
-include(dirname(__FILE__) . '/resources/character-encoding-test-strings.inc');
-try {
-	// Enter connector and capability profile (to match your printer)
-	$connector = new FilePrintConnector("php://stdout");
-	$profile = DefaultCapabilityProfile::getInstance();
-	
-	/* Print a series of receipts containing i18n example strings */
-	$printer = new Escpos($connector, $profile);
-	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
-	$printer -> text("Implemented languages\n");
-	$printer -> selectPrintMode();
-	foreach($inputsOk as $label => $str) {
-		$printer -> setEmphasis(true);
-		$printer -> text($label . ":\n");
-		$printer -> setEmphasis(false);
-		$printer -> text($str);
-	}
-	$printer -> feed();
-	
-	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_EMPHASIZED | Escpos::MODE_DOUBLE_WIDTH);
-	$printer -> text("Works in progress\n");
-	$printer -> selectPrintMode();
-	foreach($inputsNotOk as $label => $str) {
-		$printer -> setEmphasis(true);
-		$printer -> text($label . ":\n");
-		$printer -> setEmphasis(false);
-		$printer -> text($str);
-	}
-	$printer -> cut();
-
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
-
diff --git a/htdocs/includes/escpos/example/character-tables.php b/htdocs/includes/escpos/example/character-tables.php
deleted file mode 100644
index 1ce2c5c9f1e..00000000000
--- a/htdocs/includes/escpos/example/character-tables.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * This demo prints out supported code pages on your printer. This is intended
- * for debugging character-encoding issues: If your printer does not work with
- * a built-in capability profile, you need to check its documentation for
- * supported code pages.
- * 
- * These are then loaded into a capability profile, which maps code page
- * numbers to iconv encoding names on your particular printer. This script
- * will print all configured code pages, so that you can check that the chosen
- * iconv encoding name matches the actual code page contents.
- * 
- * If this is correctly set up for your printer, then the driver will try its
- * best to map UTF-8 text into these code pages for you, allowing you to accept
- * arbitrary input from a database, without worrying about encoding it for the printer.
- */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-
-// Enter connector and capability profile (to match your printer)
-$connector = new FilePrintConnector("php://stdout");
-$profile = DefaultCapabilityProfile::getInstance();
-$verbose = false; // Skip tables which iconv wont convert to (ie, only print characters available with UTF-8 input)
-
-/* Print a series of receipts containing i18n example strings - Code below shouldn't need changing */
-$printer = new Escpos($connector, $profile);
-$codePages = $profile -> getSupportedCodePages();
-$first = true; // Print larger table for first code-page.
-foreach($codePages as $table => $name) {
-	/* Change printer code page */
-	$printer -> selectCharacterTable(255);
-	$printer -> selectCharacterTable($table);
-	/* Select & print a label for it */
-	$label = $name;
-	if($name === false) {
-		$label= " (not matched to iconv table)";
-	}
-	$printer -> setEmphasis(true);
-	$printer -> textRaw("Table $table: $label\n");
-	$printer -> setEmphasis(false);
-	if($name === false && !$verbose) {
-		continue; // Skip non-recognised
-	}
-	/* Print a table of available characters (first table is larger than subsequent ones */
-	if($first) {
-		$first = false;
-		compactCharTable($printer, 1, true);
-	} else {
-		compactCharTable($printer);
-	}
-}
-$printer -> cut();
-$printer -> close();
-
-function compactCharTable($printer, $start = 4, $header = false) {
-	/* Output a compact character table for the current encoding */
-	$chars = str_repeat(' ', 256);
-	for($i = 0; $i < 255; $i++) {
-		$chars[$i] = ($i > 32 && $i != 127) ? chr($i) : ' ';
-	}
-	if($header) {
-		$printer -> setEmphasis(true);
-		$printer -> textRaw("  0123456789ABCDEF0123456789ABCDEF\n");
-		$printer -> setEmphasis(false);
-	}
- 	for($y = $start; $y < 8; $y++) {
- 		$printer -> setEmphasis(true);
- 		$printer -> textRaw(strtoupper(dechex($y * 2)) . " ");
- 		$printer -> setEmphasis(false);
- 		$printer -> textRaw(substr($chars, $y * 32, 32) . "\n");
- 	}
-}
diff --git a/htdocs/includes/escpos/example/demo.php b/htdocs/includes/escpos/example/demo.php
deleted file mode 100644
index 1c99e5cc880..00000000000
--- a/htdocs/includes/escpos/example/demo.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/**
- * This is a demo script for the functions of the PHP ESC/POS print driver,
- * Escpos.php.
- *
- * Most printers implement only a subset of the functionality of the driver, so
- * will not render this output correctly in all cases.
- *
- * @author Michael Billington <michael.billington@gmail.com>
- */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-$printer = new Escpos();
-
-/* Initialize */
-$printer -> initialize();
-
-/* Text */
-$printer -> text("Hello world\n");
-$printer -> cut();
-
-/* Line feeds */
-$printer -> text("ABC");
-$printer -> feed(7);
-$printer -> text("DEF");
-$printer -> feedReverse(3);
-$printer -> text("GHI");
-$printer -> feed();
-$printer -> cut();
-
-/* Font modes */
-$modes = array(
-	Escpos::MODE_FONT_B,
-	Escpos::MODE_EMPHASIZED,
-	Escpos::MODE_DOUBLE_HEIGHT,
-	Escpos::MODE_DOUBLE_WIDTH,
-	Escpos::MODE_UNDERLINE);
-for($i = 0; $i < pow(2, count($modes)); $i++) {
-	$bits = str_pad(decbin($i), count($modes), "0", STR_PAD_LEFT);
-	$mode = 0;
-	for($j = 0; $j < strlen($bits); $j++) {
-		if(substr($bits, $j, 1) == "1") {
-			$mode |= $modes[$j];
-		}
-	}
-	$printer -> selectPrintMode($mode);
-	$printer -> text("ABCDEFGHIJabcdefghijk\n");
-}
-$printer -> selectPrintMode(); // Reset
-$printer -> cut();
-
-/* Underline */
-for($i = 0; $i < 3; $i++) {
-	$printer -> setUnderline($i);
-	$printer -> text("The quick brown fox jumps over the lazy dog\n");
-}
-$printer -> setUnderline(0); // Reset
-$printer -> cut();
-
-/* Cuts */
-$printer -> text("Partial cut\n(not available on all printers)\n");
-$printer -> cut(Escpos::CUT_PARTIAL);
-$printer -> text("Full cut\n");
-$printer -> cut(Escpos::CUT_FULL);
-
-/* Emphasis */
-for($i = 0; $i < 2; $i++) {
-	$printer -> setEmphasis($i == 1);
-	$printer -> text("The quick brown fox jumps over the lazy dog\n");
-}
-$printer -> setEmphasis(false); // Reset
-$printer -> cut();
-
-/* Double-strike (looks basically the same as emphasis) */
-for($i = 0; $i < 2; $i++) {
-	$printer -> setDoubleStrike($i == 1);
-	$printer -> text("The quick brown fox jumps over the lazy dog\n");
-}
-$printer -> setDoubleStrike(false);
-$printer -> cut();
-
-/* Fonts (many printers do not have a 'Font C') */
-$fonts = array(
-	Escpos::FONT_A,
-	Escpos::FONT_B,
-	Escpos::FONT_C);
-for($i = 0; $i < count($fonts); $i++) {
-	$printer -> setFont($fonts[$i]);
-	$printer -> text("The quick brown fox jumps over the lazy dog\n");
-}
-$printer -> setFont(); // Reset
-$printer -> cut();
-
-/* Justification */
-$justification = array(
-	Escpos::JUSTIFY_LEFT,
-	Escpos::JUSTIFY_CENTER,
-	Escpos::JUSTIFY_RIGHT);
-for($i = 0; $i < count($justification); $i++) {
-	$printer -> setJustification($justification[$i]);
-	$printer -> text("A man a plan a canal panama\n");
-}
-$printer -> setJustification(); // Reset
-$printer -> cut();
-
-/* Barcodes - see barcode.php for more detail */
-$printer -> setBarcodeHeight(80);
-$printer->setBarcodeTextPosition ( Escpos::BARCODE_TEXT_BELOW );
-$printer -> barcode("9876");
-$printer -> feed();
-$printer -> cut();
-
-/* Graphics - this demo will not work on some non-Epson printers */
-try {
-	$logo = new EscposImage("resources/escpos-php.png");
-	$imgModes = array(
-		Escpos::IMG_DEFAULT,
-		Escpos::IMG_DOUBLE_WIDTH,
-		Escpos::IMG_DOUBLE_HEIGHT,
-		Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
-	);
-	foreach($imgModes as $mode) {
-		$printer -> graphics($logo, $mode);
-	}
-} catch(Exception $e) {
-	/* Images not supported on your PHP, or image file not found */
-	$printer -> text($e -> getMessage() . "\n");
-}
-$printer -> cut();
-
-/* Bit image */
-try {
-	$logo = new EscposImage("resources/escpos-php.png");
-	$imgModes = array(
-		Escpos::IMG_DEFAULT,
-		Escpos::IMG_DOUBLE_WIDTH,
-		Escpos::IMG_DOUBLE_HEIGHT,
-		Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
-	);
-	foreach($imgModes as $mode) {
-		$printer -> bitImage($logo, $mode);
-	}
-} catch(Exception $e) {
-	/* Images not supported on your PHP, or image file not found */
-	$printer -> text($e -> getMessage() . "\n");
-}
-$printer -> cut();
-
-/* QR Code - see also the more in-depth demo at qr-code.php */
-$testStr = "Testing 123";
-$models = array(
-	Escpos::QR_MODEL_1 => "QR Model 1",
-	Escpos::QR_MODEL_2 => "QR Model 2 (default)",
-	Escpos::QR_MICRO => "Micro QR code\n(not supported on all printers)");
-foreach($models as $model => $name) {
-	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, 3, $model);
-	$printer -> text("$name\n");
-	$printer -> feed();
-}
-$printer -> cut();
-
-/* Pulse */
-$printer -> pulse();
-
-/* Always close the printer! On some PrintConnectors, no actual
- * data is sent until the printer is closed. */
-$printer -> close();
-?>
diff --git a/htdocs/includes/escpos/example/graphics.php b/htdocs/includes/escpos/example/graphics.php
deleted file mode 100644
index 7650b6b9a08..00000000000
--- a/htdocs/includes/escpos/example/graphics.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* Print-outs using the newer graphics print command */
-
-require_once(dirname(__FILE__) . "/../Escpos.php");
-$printer = new Escpos();
-
-try {
-	$tux = new EscposImage("resources/tux.png");
-	
-	$printer -> graphics($tux);
-	$printer -> text("Regular Tux.\n");
-	$printer -> feed();
-	
-	$printer -> graphics($tux, Escpos::IMG_DOUBLE_WIDTH);
-	$printer -> text("Wide Tux.\n");
-	$printer -> feed();
-	
-	$printer -> graphics($tux, Escpos::IMG_DOUBLE_HEIGHT);
-	$printer -> text("Tall Tux.\n");
-	$printer -> feed();
-	
-	$printer -> graphics($tux, Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT);
-	$printer -> text("Large Tux in correct proportion.\n");
-	
-	$printer -> cut();
-} catch(Exception $e) {
-	/* Images not supported on your PHP, or image file not found */
-	$printer -> text($e -> getMessage() . "\n");
-}
-
-$printer -> close();
-?>
diff --git a/htdocs/includes/escpos/example/interface/README.md b/htdocs/includes/escpos/example/interface/README.md
deleted file mode 100644
index 96fe2eed2fb..00000000000
--- a/htdocs/includes/escpos/example/interface/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Interfaces
-----------
-This directory contains boilerpalte code to show you how to open a print connector
-to printers which are connected in different ways.
-
-To get a list of supported interfaces and operating systems, see the main README.md file for the project.
-
-If you have a printer interface with no example, and you want to help put one together, then please lodge a request on the bug tracker: https://github.com/mike42/escpos-php/issues
diff --git a/htdocs/includes/escpos/example/interface/ethernet.php b/htdocs/includes/escpos/example/interface/ethernet.php
deleted file mode 100644
index bfea443903c..00000000000
--- a/htdocs/includes/escpos/example/interface/ethernet.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-/* Most printers are open on port 9100, so you just need to know the IP 
- * address of your receipt printer, and then fsockopen() it on that port.
- */
-try {
-	$connector = null;
-	//$connector = new NetworkPrintConnector("10.x.x.x", 9100);
-	
-	/* Print a "Hello world" receipt" */
-	$printer = new Escpos($connector);
-	$printer -> text("Hello World!\n");
-	$printer -> cut();
-	
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
-
diff --git a/htdocs/includes/escpos/example/interface/linux-usb.php b/htdocs/includes/escpos/example/interface/linux-usb.php
deleted file mode 100644
index 9e1d96b91c0..00000000000
--- a/htdocs/includes/escpos/example/interface/linux-usb.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-/**
- * On Linux, use the usblp module to make your printer available as a device
- * file. This is generally the default behaviour if you don't install any
- * vendor drivers.
- *
- * Once this is done, use a FilePrintConnector to open the device.
- *
- * Troubleshooting: On Debian, you must be in the lp group to access this file.
- * dmesg to see what happens when you plug in your printer to make sure no
- * other drivers are unloading the module.
- */
-try {
-	// Enter the device file for your USB printer here
-	$connector = null;
-	//$connector = new FilePrintConnector("/dev/usb/lp0");
-	//$connector = new FilePrintConnector("/dev/usb/lp1");
-	//$connector = new FilePrintConnector("/dev/usb/lp2");
-
-	/* Print a "Hello world" receipt" */
-	$printer = new Escpos($connector);
-	$printer -> text("Hello World!\n");
-	$printer -> cut();
-	
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
-
diff --git a/htdocs/includes/escpos/example/interface/smb.php b/htdocs/includes/escpos/example/interface/smb.php
deleted file mode 100644
index 40988f553ee..00000000000
--- a/htdocs/includes/escpos/example/interface/smb.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-/**
- * Install the printer using USB printing support, and the "Generic / Text Only" driver,
- * then share it.
- * 
- * Use a WindowsPrintConnector with the share name to print. This works on either
- * Windows or Linux.
- * 
- * Troubleshooting: Fire up a command prompt/terminal, and ensure that (if your printer is
- * shared as "Receipt Printer"), the following commands work.
- * 
- * Windows: (use an appropriate "net use" command if you need authentication)
- * 	echo "Hello World" > testfile
- *  ## If you need authentication, use "net use" to hook up the printer:
- * 	# net use "\\computername\Receipt Printer" /user:Guest
- * 	# net use "\\computername\Receipt Printer" /user:Bob secret
- * 	# net use "\\computername\Receipt Printer" /user:workgroup\Bob secret
- * 	copy testfile "\\computername\Receipt Printer"
- * 	del testfile
- * 
- * GNU/Linux:
- * 	# No authentication
- * 	echo "Hello World" | smbclient "//computername/Receipt Printer" -c "print -" -N
- * 	# Guest login
- * 	echo "Hello World" | smbclient "//computername/Receipt Printer" -U Guest -c "print -" -N
- *  # Basic username/password
- * 	echo "Hello World" | smbclient "//computername/Receipt Printer" secret -U "Bob" -c "print -"
- * 	# Including domain name
- * 	echo "Hello World" | smbclient "//computername/Receipt Printer" secret -U "workgroup\\Bob" -c "print -"
- */
-try {
-	// Enter the share name for your printer here, as a smb:// url format
-	$connector = null;
-	//$connector = new WindowsPrintConnector("smb://computername/Receipt Printer");
-	//$connector = new WindowsPrintConnector("smb://Guest@computername/Receipt Printer");
-	//$connector = new WindowsPrintConnector("smb://FooUser:secret@computername/workgroup/Receipt Printer");
-	//$connector = new WindowsPrintConnector("smb://User:secret@computername/Receipt Printer");
-	
-	/* Print a "Hello world" receipt" */
-	$printer = new Escpos($connector);
-	$printer -> text("Hello World!\n");
-	$printer -> cut();
-	
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
diff --git a/htdocs/includes/escpos/example/interface/windows-lpt.php b/htdocs/includes/escpos/example/interface/windows-lpt.php
deleted file mode 100644
index 76294425cdc..00000000000
--- a/htdocs/includes/escpos/example/interface/windows-lpt.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-/**
- * Assuming your printer is available at LPT1,
- * simpy instantiate a WindowsPrintConnector to it.
- * 
- * When troubleshooting, make sure you can send it 
- * data from the command-line first:
- * 	echo "Hello World" > LPT1
- */
-try {
-	$connector = null;
-	//$connector = new WindowsPrintConnector("LPT1");
-	
-	// A FilePrintConnector will also work, but on non-Windows systems, writes
-	// to an actual file called 'LPT1' rather than giving a useful error.
-	// $connector = new FilePrintConnector("LPT1");
-
-	/* Print a "Hello world" receipt" */
-	$printer = new Escpos($connector);
-	$printer -> text("Hello World!\n");
-	$printer -> cut();
-
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
diff --git a/htdocs/includes/escpos/example/interface/windows-usb.php b/htdocs/includes/escpos/example/interface/windows-usb.php
deleted file mode 100644
index d4b550e2f93..00000000000
--- a/htdocs/includes/escpos/example/interface/windows-usb.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* Change to the correct path if you copy this example! */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-/**
- * Install the printer using USB printing support, and the "Generic / Text Only" driver,
- * then share it (you can use a firewall so that it can only be seen locally).
- * 
- * Use a WindowsPrintConnector with the share name to print.
- * 
- * Troubleshooting: Fire up a command prompt, and ensure that (if your printer is shared as
- * "Receipt Printer), the following commands work:
- * 
- * 	echo "Hello World" > testfile
- * 	copy testfile "\\%COMPUTERNAME%\Receipt Printer"
- * 	del testfile
- */
-try {
-	// Enter the share name for your USB printer here
-	$connector = null;
-	//$connector = new WindowsPrintConnector("Receipt Printer");
-
-	/* Print a "Hello world" receipt" */
-	$printer = new Escpos($connector);
-	$printer -> text("Hello World!\n");
-	$printer -> cut();
-	
-	/* Close printer */
-	$printer -> close();
-} catch(Exception $e) {
-	echo "Couldn't print to this printer: " . $e -> getMessage() . "\n";
-}
diff --git a/htdocs/includes/escpos/example/print-from-html.php b/htdocs/includes/escpos/example/print-from-html.php
deleted file mode 100644
index f0751d7a4ae..00000000000
--- a/htdocs/includes/escpos/example/print-from-html.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-require_once(dirname(__FILE__)."/../Escpos.php");
-/*
- * Due to its complxity, escpos-php does not support HTML input. To print HTML,
- * either convert it to calls on the Escpos() object, or rasterise the page with
- * wkhtmltopdf, an external package which is designed to handle HTML efficiently.
- *
- * This example is provided to get you started.
- *
- * Note: Depending on the height of your pages, it is suggested that you chop it
- * into smaller sections, as printers simply don't have the buffer capacity for
- * very large images.
- *
- * As always, you can trade off quality for capacity by halving the width
- * (550 -> 225 below) and printing w/ Escpos::IMG_DOUBLE_WIDTH | Escpos::IMG_DOUBLE_HEIGHT
- */
-try {
-	/* Set up command */
-	$source = "http://en.m.wikipedia.org/wiki/ESC/P";
-	$width = 550;
-	$dest = tempnam(sys_get_temp_dir(), 'escpos') . ".png";
-	$cmd = sprintf("wkhtmltoimage -n -q --width %s %s %s",
-		escapeshellarg($width),
-		escapeshellarg($source),
-		escapeshellarg($dest));
-	
-	/* Run wkhtmltoimage */
-	ob_start();
-	system($cmd); // Can also use popen() for better control of process
-	$outp = ob_get_contents();
-	ob_end_clean();
-	if(!file_exists($dest)) {
-		throw new Exception("Command $cmd failed: $outp");
-	}
-
-	/* Load up the image */
-	try {
-		$img = new EscposImage($dest);
-	} catch(Exception $e) {
-		unlink($dest);
-		throw $e;
-	}
-	unlink($dest);
-
-	/* Print it */
-	$printer = new Escpos(); // Add connector for your printer here.
-	$printer -> bitImage($img); // bitImage() seems to allow larger images than graphics() on the TM-T20.
-	$printer -> cut();
-	$printer -> close();
-} catch(Exception $e) {
-	echo $e -> getMessage();
-}
-
diff --git a/htdocs/includes/escpos/example/print-from-pdf.php b/htdocs/includes/escpos/example/print-from-pdf.php
deleted file mode 100644
index ba6a4c67a96..00000000000
--- a/htdocs/includes/escpos/example/print-from-pdf.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../Escpos.php');
-/*
- * This is three examples in one:
- *  1: Print an entire PDF, normal quality.
- *  2: Print at a lower quality for speed increase (CPU & transfer)
- *  3: Cache rendered documents for a speed increase (removes CPU image processing completely on subsequent prints)
- */
-
-/* 1: Print an entire PDF, start-to-finish (shorter form of the example) */
-$pdf = 'resources/document.pdf';
-try {
-	$pages = EscposImage::loadPdf($pdf);
-	$printer = new Escpos();
-	foreach($pages as $page) {
-		$printer -> graphics($page);
-	}
-	$printer -> cut();
-	$printer -> close();
-} catch(Exception $e) {
-	/* 
-	 * loadPdf() throws exceptions if files or not found, or you don't have the
-	 * imagick extension to read PDF's
-	 */
-	echo $e -> getMessage() . "\n";
-	exit(0);
-}
-
-
-/*
- * 2: Speed up printing by roughly halving the resolution, and printing double-size.
- * This gives a 75% speed increase at the expense of some quality.
- * 
- * Reduce the page width further if necessary: if it extends past the printing area, your prints will be very slow.
- */
-$printer = new Escpos();
-$pdf = 'resources/document.pdf';
-$pages = EscposImage::loadPdf($pdf, 260);
-foreach($pages as $page) {
-	$printer -> graphics($page, Escpos::IMG_DOUBLE_HEIGHT | Escpos::IMG_DOUBLE_WIDTH);
-}
-$printer -> cut();
-$printer -> close();
-
-/*
- * 3: PDF printing still too slow? If you regularly print the same files, serialize & compress your
- * EscposImage objects (after printing[1]), instead of throwing them away.
- * 
- * (You can also do this to print logos on computers which don't have an
- * image processing library, by preparing a serialized version of your logo on your PC)
- * 
- * [1]After printing, the pixels are loaded and formatted for the print command you used, so even a raspberry pi can print complex PDF's quickly.
- */
-$printer = new Escpos();
-$pdf = 'resources/document.pdf';
-$ser = 'resources/document.z';
-if(!file_exists($ser)) {
-	$pages = EscposImage::loadPdf($pdf);
-} else {
-	$pages = unserialize(gzuncompress(file_get_contents($ser)));
-}
-
-foreach($pages as $page) {
-	$printer -> graphics($page);
-}
-$printer -> cut();
-$printer -> close();
-
-if(!file_exists($ser)) {
-	file_put_contents($ser, gzcompress(serialize($pages)));
-}
diff --git a/htdocs/includes/escpos/example/qr-code.php b/htdocs/includes/escpos/example/qr-code.php
deleted file mode 100644
index dbf21aaedf4..00000000000
--- a/htdocs/includes/escpos/example/qr-code.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/* Demonstration of available options on the qrCode() command */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-$printer = new Escpos();
-
-// Most simple example
-title($printer, "QR code demo\n");
-$testStr = "Testing 123";
-$printer -> qrCode($testStr);
-$printer -> text("Most simple example\n");
-$printer -> feed();
-
-// Demo that alignment is the same as text
-$printer -> setJustification(Escpos::JUSTIFY_CENTER);
-$printer -> qrCode($testStr);
-$printer -> text("Same example, centred\n");
-$printer -> setJustification();
-$printer -> feed();
-	
-// Demo of numeric data being packed more densly
-title($printer, "Data encoding\n");
-$test = array(
-	"Numeric"      => "0123456789012345678901234567890123456789",
-	"Alphanumeric" => "abcdefghijklmnopqrstuvwxyzabcdefghijklmn",
-	"Binary"       => str_repeat("\0", 40));
-foreach($test as $type => $data) {
-	$printer -> qrCode($data);
-	$printer -> text("$type\n");
-	$printer -> feed();
-}
-
-// Demo of error correction
-title($printer, "Error correction\n");
-$ec = array(
-	Escpos::QR_ECLEVEL_L => "L",
-	Escpos::QR_ECLEVEL_M => "M",
-	Escpos::QR_ECLEVEL_Q => "Q",
-	Escpos::QR_ECLEVEL_H => "H");
-foreach($ec as $level => $name) {
-	$printer -> qrCode($testStr, $level);
-	$printer -> text("Error correction $name\n");
-	$printer -> feed();
-}
-
-// Change size
-title($printer, "Pixel size\n");
-$sizes = array(
-	1 => "(minimum)",
-	2 => "",
-	3 => "(default)",
-	4 => "",
-	5 => "",
-	10 => "",
-	16 => "(maximum)");
-foreach($sizes as $size => $label) {
-	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, $size);
-	$printer -> text("Pixel size $size $label\n");
-	$printer -> feed();
-}
-
-// Change model
-title($printer, "QR model\n");
-$models = array(
-	Escpos::QR_MODEL_1 => "QR Model 1",
-	Escpos::QR_MODEL_2 => "QR Model 2 (default)",
-	Escpos::QR_MICRO => "Micro QR code\n(not supported on all printers)");
-foreach($models as $model => $name) {
-	$printer -> qrCode($testStr, Escpos::QR_ECLEVEL_L, 3, $model);
-	$printer -> text("$name\n");
-	$printer -> feed();
-}
-
-// Cut & close
-$printer -> cut();
-$printer -> close();
-
-function title(Escpos $printer, $str) {
-	$printer -> selectPrintMode(Escpos::MODE_DOUBLE_HEIGHT | Escpos::MODE_DOUBLE_WIDTH);
-	$printer -> text($str);
-	$printer -> selectPrintMode();
-}
diff --git a/htdocs/includes/escpos/example/receipt-with-logo.php b/htdocs/includes/escpos/example/receipt-with-logo.php
deleted file mode 100644
index 8322c09c750..00000000000
--- a/htdocs/includes/escpos/example/receipt-with-logo.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../Escpos.php");
-
-/* Information for the receipt */
-$items = array(
-	new item("Example item #1", "4.00"),
-	new item("Another thing", "3.50"),
-	new item("Something else", "1.00"),
-	new item("A final item", "4.45"),
-);
-$subtotal = new item('Subtotal', '12.95');
-$tax = new item('A local tax', '1.30');
-$total = new item('Total', '14.25', true);
-/* Date is kept the same for testing */
-// $date = date('l jS \of F Y h:i:s A');
-$date = "Monday 6th of April 2015 02:56:25 PM";
-
-/* Start the printer */
-$logo = new EscposImage("resources/escpos-php.png");
-$printer = new Escpos();
-
-/* Print top logo */
-$printer -> setJustification(Escpos::JUSTIFY_CENTER);
-$printer -> graphics($logo);
-
-/* Name of shop */
-$printer -> selectPrintMode(Escpos::MODE_DOUBLE_WIDTH);
-$printer -> text("ExampleMart Ltd.\n");
-$printer -> selectPrintMode();
-$printer -> text("Shop No. 42.\n");
-$printer -> feed();
-
-/* Title of receipt */
-$printer -> setEmphasis(true);
-$printer -> text("SALES INVOICE\n");
-$printer -> setEmphasis(false);
-
-/* Items */
-$printer -> setJustification(Escpos::JUSTIFY_LEFT);
-$printer -> setEmphasis(true);
-$printer -> text(new item('', '$'));
-$printer -> setEmphasis(false);
-foreach($items as $item) {
-	$printer -> text($item);
-}
-$printer -> setEmphasis(true);
-$printer -> text($subtotal);
-$printer -> setEmphasis(false);
-$printer -> feed();
-
-/* Tax and total */
-$printer -> text($tax);
-$printer -> selectPrintMode(Escpos::MODE_DOUBLE_WIDTH);
-$printer -> text($total);
-$printer -> selectPrintMode();
-
-/* Footer */
-$printer -> feed(2);
-$printer -> setJustification(Escpos::JUSTIFY_CENTER);
-$printer -> text("Thank you for shopping at ExampleMart\n");
-$printer -> text("For trading hours, please visit example.com\n");
-$printer -> feed(2);
-$printer -> text($date . "\n");
-
-/* Cut the receipt and open the cash drawer */
-$printer -> cut();
-$printer -> pulse();
-
-$printer -> close();
-
-/* A wrapper to do organise item names & prices into columns */
-class item {
-	private $name;
-	private $price;
-	private $dollarSign;
-
-	public function __construct($name = '', $price = '', $dollarSign = false) {
-		$this -> name = $name;
-		$this -> price = $price;
-		$this -> dollarSign = $dollarSign;
-	}
-	
-	public function __toString() {
-		$rightCols = 10;
-		$leftCols = 38;
-		if($this -> dollarSign) {
-			$leftCols = $leftCols / 2 - $rightCols / 2;
-		}
-		$left = str_pad($this -> name, $leftCols) ;
-		
-		$sign = ($this -> dollarSign ? '$ ' : '');
-		$right = str_pad($sign . $this -> price, $rightCols, ' ', STR_PAD_LEFT);
-		return "$left$right\n";
-	}
-}
-?>
diff --git a/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc b/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
deleted file mode 100644
index caca76c4479..00000000000
--- a/htdocs/includes/escpos/example/resources/character-encoding-test-strings.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/* All strings from EscposPrintBufferTest are included below- These are fully supported
- * on the default profile, so you can use them to test modified profiles (using the wrong
- * profile for a printer produces mojibake) */
-$inputsOk = array(
-		"Danish" => "Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.\n",
-		"German" => "Falsches Üben von Xylophonmusik quält jeden größeren Zwerg.\n",
-		"Greek" => "Ξεσκεπάζω την ψυχοφθόρα βδελυγμία\n",
-		"English" => "The quick brown fox jumps over the lazy dog.\n",
-		"Spanish" => "El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n",
-		"French" => "Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ.\n",
-		"Irish Gaelic" => "D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh.\n",
-		"Hungarian" => "Árvíztűrő tükörfúrógép.\n",
-		"Icelandic" => "Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa.\n",
-		"Latvian" => "Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus.\n",
-		"Polish" => "Pchnąć w tę łódź jeża lub ośm skrzyń fig.\n",
-		"Russian" => "В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!\n",
-		"Turkish" => "Pijamalı hasta, yağız şoföre çabucak güvendi.\n",
-		"Japanese (Katakana half-width)" => implode("\n", array("ｲﾛﾊﾆﾎﾍﾄ ﾁﾘﾇﾙｦ ﾜｶﾖﾀﾚｿ ﾂﾈﾅﾗﾑ",  "ｳｲﾉｵｸﾔﾏ ｹﾌｺｴﾃ ｱｻｷﾕﾒﾐｼ ｴﾋﾓｾｽﾝ")) . "\n"
-		);
-
-/*
- * These strings are not expected to print correctly, if at all, even on an Epson printer. This is due to a mix of
- * escpos driver, printer, and PHP language support issues.
- * 
- * They are included here as a collection of things not yet implemented.
- */
-$inputsNotOk = array(
-		"Thai (No character encoder available)" => "นายสังฆภัณฑ์ เฮงพิทักษ์ฝั่ง ผู้เฒ่าซึ่งมีอาชีพเป็นฅนขายฃวด ถูกตำรวจปฏิบัติการจับฟ้องศาล ฐานลักนาฬิกาคุณหญิงฉัตรชฎา ฌานสมาธิ\n",
-		"Japanese (Hiragana)" => implode("\n", array("いろはにほへとちりぬるを",  " わかよたれそつねならむ", "うゐのおくやまけふこえて",  "あさきゆめみしゑひもせす")) . "\n",
-		"Japanese (Katakana full-width)" => implode("\n", array("イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム",  "ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン")) . "\n",
-		"Arabic (RTL not supported, encoding issues)" => "صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ" . "\n",
-		"Hebrew (RTL not supported, line break issues)" => "דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה" . "\n"
-		);
-
diff --git a/htdocs/includes/escpos/example/resources/document.odt b/htdocs/includes/escpos/example/resources/document.odt
deleted file mode 100644
index 4bbd7f98b654dd1f8086589f22bfb9ed7ecb4c9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 39751
zcmZUaRZv}Bu&r@-ciFg;1Pd-3cXtT^g1ZNIcL?t8?j8sb+}+*XC3pR&>OP!04^(zh
zDGJt_v%AMPMk~oe!{9(bAV5Ia+vH0a{P~PR2LS=`-xu&L2pbC<Q)dr*({J|n))wEt
zIa}D-vboxtu-bidvT$Oxvp2OhvHR{~V`}Tn>TK%ntn|NrSi4(*exnuy#D8A|zz<V1
zcd;?H{bph9#OD0}KeF1}{s>o6kVHiyLIVB^s<aeX1^Bla0s;~O0SfpO?@AmC0ipF%
z8Z4sbo_U_-v8FNm@^A5dpzjkYNzmB$7?dJj3x#-@yabL44AD^gZZC(i+fS2}s6?e4
zj6_LhWgJpTg<!%256_Fu*CwGJ@2-W0%aVun*~H(Em8Y?<O_yDZ2ESdr7dR`sLTu`n
zE0J-`cN@oj+oAk@E^#QZ=!2oaP(@09Qn@%t7>G%tkRX2*dSPlMBpW2qvNc!Y$d#^^
zRw>`hsGW$2Kh_iXz3h%0_@(1`j5}q?@#B8cP(738%4+a^E`Tf2F+=Y}{B7G@6$4ZC
ziAA+|j27#OL4RO&U{=1fqi*0~F=B#+=}{Sx-d}B$eR}Voj#sN!<M3gQZ@1_D$$9fC
znqYq`Dlykt=k0_fnFlqZ;Op6!nX|UT>^m34j5~7gyXlLL%kJG6z89~<^rQu<dC8G+
z#mu9!wPmvmn}f+5#c4@WmpQhcHx-O{GKWv5f0J(ZNB`Z|_$C*R%u9dtI#d(Y-j%23
zJcW|`JYD@pZ@ZmU6guzu_tA0QOf24tFvS>|o{`NIbrc&w`335^;*Y!tI5m~e?Si%A
z?6d7!Yakl0c}>@YPQ6LEh{<3CE;R&b=U0SYqxm!<U8djMpl8P=^5ou+@NxIAimOiV
zgZPF@NEp|!3}MU$o$jkPEwCUsuvOc3lNMZ>Gs`kvju#YKZ~lz^^<JW)>&e`4MNK!<
zKr}J8Yh6Ed(?k0W$JWO-y`q*K63Egci`Qif`DW=yj(53c%}0sQ`*Ae)27!R*-R8#w
zclEcOv9vEeZ#Sb6xJ*zKT?j+*0-QX@g^5Po_zgcMeg3^a5_4KMo>q4xxc`YFT(#>F
z_^JwnK=8?Uz~}WmwEbn&@B`{Y@cm9T;r;D)Qa+ty`CBNdRD)4pfaz$8da2U(lo&dV
z?|_7@)k5Xh>jCUduUmOXp0nEDrRY2#FQ+vO&M$Yzs6-s@=S_>HU)U0e9mUbrt90&x
zxApUJ-Ay`HP^;aUVSZN}!r>3$548#n`JEClhM3b41b<PN8e;Td!S(JCxz|;n+8D<I
z_okPa;6caRM7U>uvxN`TQAX}~jJXj<JN^O{91g^pgpnkP1B|iKVew{-VGkJw@c5x1
zOBwh7CIf%u9Azj;K%C#OEL+!Ho*4WI{OJe=$J_g*ukT*GBx~CqR-rhp9{=lE!xjY1
zC-*C(%2kIU(!~<R9Adl9_%%2*lBFV9{4vNUVdy5C)dzogGU3&{L(BPc@o+!5CzV8@
zf6tR@QLn;pPrI??f?hn@oYqTmNOPsifk}<QA%6U=2gbkqU};0fjv=Vs53}6bUC%u)
zyB;;l)ew!;%T&alw$dlQI3G<toUi_V)YE<L0G+_?Kytjt;g$94!h(`u3=4_%f>JNm
zJ2t%^*Uf_u#xqXQAljdHA}`xdSz)50wOZ}B3#Ak1lBH{h$bRZMPm9M2zR<^F<T19}
z$Q{rj+3$4NFSj}U5J<50dAlA0ueSzb&A`^A%H%c|!gG9P#Swvp;KsK^AfTaf-*+h=
z;2ei+y1K4v*+`(;*<lTHrF8l{H-6dkFWc*2EG_UWZO&%ZbRKRaTD1Ga@(<O2Z-#Q=
z<}e8Ol+Y0E!$aV>J0m#=H+LlL(}gOg%K`DRqSpj67L{ge?TcPjn6XG>@@9xZF>$vQ
z3%Z0pV~)Odm(!_p1jI?R=bL?k&p3QKKW_F$?(_`~adE;Uw$>L7eY0kmG^^#@e6I)b
ztrn}J#dF1+a;)SCWK4nQ0n0RZ2%O!bi6gEtLL_w3Km$x$bA%`=Ut1M;YeI}|mh!vn
zA#!L06#90Us=(yEk8<^j0hrCMB7JALbSf>ols%s>P$0F84~AHlfB346Vf(?C#mLNE
ztXrhkqCU%E)<^lkaWAfR!4BiFS(zJ5{e48iFCc!cg-P$^<3E_JX&~JUPv%aMX2hch
zqvWf%2b7Q@*3?~Tx5eOy10B0(nAE31H%k9bq-u4VG1CCk+`}1Jwx&18O#Saw5lys~
zmzT>_%2$v|Ty7ys?Rg`lyD}(A3~A!oGF$v@jDI;Hb(<wvU7^gO+g}2ZS%nLhI(&$F
zl#sP;3J2h3vGQ+z8*R!rc)m>6{G(U)U;^ROsF3v>9{m}+IOt9lWZmhU$U`Ql?>5ro
z|JeRM=qv}qc+|Fz-80Fh+#^ZdNI}n=d6)Cb)1kq3xh34|L?D3<MXi^^x~_$tNz4Cj
z?&{=3_&!wBDWRFgJ+;@ljc@p-b@6<AnB%%)u|PF$wCWCrK+!Gmem865O!=vPg6Re(
z+=?9!IE0nV<{+nv?EOl^<WetdXI5o+Rt_X?haGSy;Tq9l-hhYux(o@M%MIaCv*`P5
z69TDD9z!=B8tDZkCCHyCX0;EVJc<WV{`gUEtKR$L`OrNW0nWG9?Q&zjLQ`nV4|?P0
zr2s$5n(pU5w!GIJhy--Pglu8xhMN((oGnTfjBKPl$n8m>qKA!&21$re)5?Gh_Qg-c
zvKfEzwT=*Z6zHiVP9{m3#59B-%6gKFTz0?4m~bF1Cim<~Oyqb!5Mof12_B?=r%#W7
z#Mww7f0q=It~O>}PcL}_-HG#j055r$-_j%s!_Nq^`xYOO5_(DCTR#lRjCO<B^dh2k
zn06dZtP*s~hNo3D5vLS1Sm_K*GQ1UxZ@_aur|J=j5oiK#0Mo1u#h=ZVphJG4fEI}5
zzZnKPr(!*$dO1eb^l^B0?^M0%Xxt+_xmT_EbbhwLPe*y<0JJr&a+qd_PvVVsn;&H*
z*_I2H+BF7USCP^XXe&)t+?I2tw(IT6<o42SdSe;f=(sLGso}C-!Z>u6B}k7JVtX<q
zmb>JgyswKzG^>>Vqzfek|9(&UxnrsWM(?fYcDTYRyQ7(gMF!ooO&IP9r>ggUT9W*I
z#i}NcT0!vH#Cc?^FYuaGv&NvxC^ZZ-*uPoW{qDP;xb<h#zc{?y2wN_wKDk_BRDQC*
zSoLjt-XFd?9pn-m4X9UWi2G1O2Y}_kc!6-JAOc9d#*{JtbU2+>IQyVJB2GzVWnE*t
zyS1n5-ARE*y+X7QDMb=lk)Q#JC2@a(*c4WM8B$@ow7E)cY~cbZL~nnh=wufrLb35L
ziT^J6D_gb9>KkZv@S{&pbz=*w{ozJMlCNpbbtSMyoo8swX|rUsEntRK5{gZt|BmXz
zA_0X&ymYoiaS=nK$LBo`8$sBp7B^A>ikHT1t2;=*c8w<qNwnXf^Zj9!=vJa7@uMQF
zmDcHEGW8Sm`1M)C<V5CIRWXJ=iF)9nZ#s^$ROvM7)EN&RVqP!2gdqq5mAU%M1do_L
z-uow;6%KVoet$S&IM&z4OT`^Fs-1v{uIGac0@68LOGMp3dB}R3mBu`@BlILBbE+1s
zSbGXM$KrC}<bZx$_(`RsdvWrBv5&t0*W#82Pe%F`vUqU|Dw_)s488BwQ_aX>{CGyD
zI@GiZ40?^n(>e8WwSmg0|Hf7M#o{Q(86{T{UZO15b|jP)DG~SNm*32gcpMWWOe|!D
zh=4i7eqMDM1~WvP8p6V^K(0avI(f|IRI9`Hmr`alU&XKcIOP}l{+e4&w-bDBXG@rz
z5X^Bf8%%#9H`eM+Wl<nwr92k2f5bzitUJ%jztOZb+pIdmlft?6(yZ*?jIxEkKJ`@T
zwn&I8)A$Xlsv%Tv|60i}a<2fMzZQ0c&z3)YDKvw0NZcOfHQpM`-=Al7@ap+R)rAKn
zYU{46Hc~j+XawvK-`$2t-Hf&{DAAt2#|lUgF@OGx4u2HER9&iBL-w8>k>^~~ep0^N
z@I&?1Y2quqMvYz@))fEKRv-tA7j#Xx_p9LJnv)t<N&@=AZC)r@zW*fuElQW$-O+R-
zj&=M~cvx+%iGr<E+y$@mk&=;4KzznsScqALrpTT0u^c$SEM<FOv0(~sVawp?^y}i*
zA99^u`ncq_&9JyrA#oEAndK9wEV#~RSwWdIV|fL9aJAN_*0Qy&tnRO3wGz)tBt3KB
z%K$|8s!3^QwtM9+@!6;3LtQ9C^~xbs(Mc-)zv8{Uo<P@gW*k64>*a<DMEo6sDrSgP
z+(*+$IwB?K?T0ggS1O)Ku!*h6A3qVYzGo3jCU6wTVbT`>>s<J9e>&>3eUjyIkhWy(
z$=oW*Ao%gLy9bfldYSJqILg|AqGvqiFNOG)(1{W)4_`+K-@(B79iK&~k)4T2)$+To
zphi&1K;tK$_sR&DakWp`{hYoWifuFoZgpQ<-X?|qc~uznuQx<I|EA6umG@-tX;n3P
z&yQpkHFAEps&0dOmsym&ji)>LE6$49Ou!<w2%ojK{PVJ_=V=Ey;W!X<*<R|akj`-o
z+=;-tyDnh1&z|}w2Zn%Z?LgRBVjH6mSEgGNdHvhw5Knse%dIbyDc)7iP4hnTrf_#g
zHTt#tUoziAIs>nrxN4|Ts0FR>@C@68WFF!q){^&`c)s2!<0qf*5Pt`#Ea0q6Pj|)K
z_NreziW3qr{eS11VSaO%ssT#_gJ|#Hsp%Y_7Yh<76bxIKRuSY4V4UKS5DP)++kyD?
z^P&wtaa>-lf2r=fa;6`ITyC0?pj5wsk%-AJ$rzGw!(bK2czS{;w(MwY3=hWkZ6dvV
zsVQ9|NJdk!-5q~#W|9>Z!ynd#+V!94miO{rIn+0^uBDH;c@pl3qvcF?{5hp{1hbfU
zV~%58$`xhf97nOY4ULC~V=3Mk+uW&HAQ?2B1IlZJZZ4f<!b66R{~QWa`-UUj`YU~-
zXh!b}K>TlFpX9sbml>FxqCj;MMzqBcq;<vi+WJOeZ43pY*endw6a<Ptk3%qm{YC*7
zyz%qDS@Vc5$xD!VMG>=1A1Cw=RMJGoQJPQ@0g*li#TH5K-!OA}+(Tr9K-CrK2To#y
z;aL<M(zU$DT*ptpQv)>(Jc8lOPo@UKv8QRS>Lj9xjL0=f*z|p%)ioC(6`vYPB{RL!
z7Yn7alNj0iZ;SYLB$UVr{xYfgtwDf_AVjc~KB4ea;!dElQnJqvAXtjqb|Nd%$))Bh
zbN(&D4H6P2H=T&&2n|SK)(+77_Go5-iP^-<0%{5)!QdaB3WYTdtBb3nf?V63p4T))
zMK^ugqP!^aPtGvM6sWKJo-BS^N~a@36#wc@?1_|$0F5~Aj%i3nD|>8f>oh}Y+=V*P
zF9;=yRIJ{M*SaMKs1So7d$lk#=gSRJ_za%t>OjFlu_<WtKoUhYCKgEPC+({+4x_Ne
z_zK)mJ!v@FBf?T8J$^6lOwK#TX9(DS8Y7Wh*+a1teptm$C>TEHBM4eJbTSmZBY~sa
zUxq$}*#?dyG^K7bdF0s3Gp3qVI^xF07NW*cP>_uC6uH7FTjBZJ44g3g!X8dp9Z`?r
z#6oIRctnR&Q^Ap*J<+!QI#9fWN^n#(Q*_$i@l#jf`cl|Z>aC@8r}|D?YJ{Fd8?32L
zb=NHK4wzJ5wkKXOgs14giy(92B0z49{ni$zzmn>CV6|Y+UlSqU86w5TY!!Jgrx?E;
zu?atL%`Lq;e!`VZQh9U9o+$X7PG87}6FQO0RIr3NZF*J;hX;9D?cuP)8Dba`H9!=<
zs(16s%gIrOfUywUaLt_gpT^zl^`F6$x#Zho<?8;c^z|q}QaH^Z>0Z#}Wdrw7Ii*zE
z6ircvUzu`ns#I-Fj@SG4V7x>wP4xY$3Xp+fnjzB&*5@lt!|v<tE_aA`&Gy1QLoxP!
z^72F=fmS$-Fpv9_d4#~NXm&e5v!zO7QPADwQQUx+r+OID6+*P*wFg~>ZXM(OMo{f@
zjqJyz0zc~liefZ{<vKE+)e?F<lvU*Ro02efvx*30u<>gxEE2g9iDyg_L3cW*RlWs>
zTiJj}^zE9Z=Gw1sn?0@$Mp|3)eUFB04>finjy<BUBYST6I9Z!LZApTxP?+NtI`kg6
z3st(@>y(+hH31_)$9+}+*|n7xm=qA2<Ec8IEja+)qm^n45nn_ggF_geJ6hAe<|#62
zyxuXdjbEj?T(L+d`7K<Q5r@DcBCcOZ6h#0^g8DZjWMl{`@ypE?kyRD4%ykJ#5&_M#
zYWOYp(UYI7Qkk5=$l}xzKCMtlBg8x$L6RV`;)jyVG8Lz^8wOTZwuw8tPtrDgPI&#8
zn(2<#B36b{mGeLD)2eylXn!;3*c8}jPEAa+i53|0?#JA416G5;-B5)O49wWE-<%2&
zcAh6YmpmUGKK9iCQIwAI&OHN$KfuSB(JR76A?Lk2PnB*P{80mk<8sr|!g}A0?YTz4
z;|pV=mUdLu6B+yJO3w1A_^oO5#N!f9bxtL*5bjyw%Mu5Bx~R!?Uvo7%R5GvOl;yaH
zXIC?ZX59}OSkEqLU!2pz&T5M0#-sP+o~*u7Z`4O7C`aUBD*TwtmZx88v{3Eg&fvG_
zY+RwyT*n=lg?TQz#L`={|BX69Op}OyxvF`{@<SzC6nY!Z0E$aWU1d5*vz0T8&rJiL
zBl7#Q&V(l{Q)0A+N?R-R9&6T$V?P_M;82gp-L&L2eU9e|13z6r9{`Sm*yB<owNRMK
z?5sJ;l?x<btb&Xd4Suq)Kn(!&W(8m<u7kLmD8yWqzz7d+_Iu6w_eNJIKxPn(gsV}h
z<sT@nC$TCm9XT8%998QJ0FzX^dXRevi_K~?%@6rO7Hy{+B7DlQ!IFZMppMoEVBF36
z@*{?qRk;@$oqwu8GL{Wgu2K~7Ed>S`IuBV`S}5fX*V~*9K~k-~uoG0nzZv?12V`@3
zh!g|cq@(0_0F{N!tqfE73`h;mVcPvZD)*q*eyVy<04!6dZilPQhhv{EF_$%k1Hhbs
zQCsG?wVlZL>wc1IsZbwISRONnDsYix-z>O)eGiLxF~2}gfCkxzSVCZmdKv+Y2f<j`
z%lFN=|L2S!BK1nOK3{-SxyTu+-_@9b=W!9Q%gLJWzjqi@VHmC*4eYOfe_gJ3a7X34
z48WK`Wp5$+knQhK{WoMd(-DYH5ZqyLGm68Ojk9AeI`;ZOx;sVUv%$sA;kqT5VN6ia
zMIns$hTd-$`EZyWP31|M&J;>FLVnGYHJiw6n-qM-fSl%Er+m_@HG+I<1(X<?(3`yp
zqA{&PCW5CCw-+^2t*9}6RXn9pv7JRK;RYs*KLJ#=&-;r%$_boa983}RCuQEQ6M&b|
zo<PF4QU!I)m#d2v#sAwINgVl`T#lCq&KvJ{^cg=oLPKm0muls{vsw!5Nl}qePM?H>
zJrl1&S2?KH;CicqL1O3Lo+(x_z(h6e)ux7&TC6ctEE!_RBe$3DdlB{{6wL%$B29g~
zMKAyKy7V&u7ObR6>gel581Kw5pf@}ofzjsRmoR>=ABwRW2i^tj%s%Zpnp9q<6jhkl
z?KpQTSKI(+Jsqk(9)cxiX(t9mAFLK6&5b6rz@ky`0mdWL=ZgZ-w<1+t1xH5xIq5qq
zS?s&vf9gcHMQ8C{z}>;p3dtX6a@1&RR;x5gTKr|872aH`+rpYZSc&z5M#6)^88ZwS
zfr6p60RN(E*LDBj{JlG@!qkgF>A0gmPnMMH6Q<ygR!f2UoGbej=~xUtBWjM?X$_Qs
zG}yDN<~xFvFgL=2V3WzCokKE>Dc>c6@YjF-Ck)f;Z-K+(nhvA4ixKApC=AHD?s3}@
zda1fS^iZ6PD)Rc`gG5iEPbj;N5~|HXD(x{afy&HL2e6g~pYYFDTMii%LZH4N5dL;<
zry>%kN=@}Lsqt6N6^6Qi2qVIbhxjS&Ihd2meqr84szMj~Cz_Z_Xgmo{k(DT~Wt)%#
zQt)#%Il<1vdCO+Zcgp?BXC@+H)nhI4Y7dz5)-7=ZI#eTAR=k;CNMipkl?@`PIkH*A
zSXoLOtbEPERw{9!w8)I<CD^*~gP<o7p~Wyg+J#v2`sp=Lhmz+w=&FEh9P96&-8I*5
zoSHW0EaREU26dUHH1F(u#OT@|aDisNIDbc{c<iu3ZbNPzORSdY(;^F;WOrlTo}Zt-
zn@;G~?#Al2?$8!%4Pu$~-;9uo-MakbqV4fy<>F281-Y}rrr4P>-pd>`8GSj8c6=e>
zFv!619|SN|v3$ltyNlJDT&9Q~e9kWH22@ogch4v}?-voXNCk-7Ym=y2b@d7C5_Ei3
z^tM`6Z-f%WiTgIcDHI{Z%Oy*7D6glS**h!fuSE3qiq5Y3TP(a|1FQH;-o#oBFh1|t
zIoEGwNBEk?f2|e>Gy4e#Y?ACM=kL}Am<B9*4a{Lgzt^<l+iQ<-=o8;6ekLkgp6HYn
z<Y^{AKHcGfE=j#xqM8Y#db6~G^VS`rSHeJ~k3{x1kZ7mNa!%l4knYR~|8qL*pY%j-
z407qEWlY$?blIxfAN_R;LftMtk(*_gUfT{Bc!}7%IV~^&&CN)#KFR(}u98T+f4=$^
zc1NSv^QO*RpqZq?Jl|rT?U=VljVz#YKs4BLB;lL9n&Pg*5F&v=Nf2KbY6Vo2kgC?4
z#vC5lwImi@JUl9t&K`g(#L1!3TIN1n0@gshBw6?qKt0WORGj4+%*NxGl%;|GyEjYm
z^}-4ba|9SMKf7J%d94C+9lI@#vc_KI4jfXrY}fO?;rq{<)!q>voh<6Rh!-;3u<GT1
zykzsgi3H|1fH4FB?TF8+$78qA30M-8F6s6sWhD=nn>qHHd^3KyDm%Xu{7M>4fx*T^
z_Ox+6Mewrdh2GQo{eE%uvio7hN;yBs-9!ov06Ykm$#B`eAJ3trt_0S53==#IWt0x&
z**>eyHi#Xzt=n*n5<l4hTfxUexjMT!07Ub_XWes{{c{Tot-}ng=XE`3vI?+!JQf{_
z+>NfEsy{Lx0mj9%>n*}0AJ$sBifI@{E|i@Mmpi3UE@jW>^<-c8b6OnVe-mKt8T9z$
z4gePDGX}*2&7}ij3rXu}-}~i`vI3Anzxd2CDS{!6veKTcHiHncg|R;S0NCxD48Ur7
zLnHe^=`R3sn|}Il(A9_`6YvDEQ&Q=>RE)rbmXg$%Xw{ki)pq`S<1l%*RVR!Vg*E#f
zfbfO`GQDm_f<!rxlrc>N?xw_yFs1yHnW|d@$^*(_k@3u3jXn+}_)LWXcfn!$m*sn~
zemlg@n<YG|$lfJpo4MKNp7bk}`5MEVO*B&8qe~G?Z8WtRwqFPI@LJpX0&LDXt!zyb
z8M)4eFdqSKFMUEE*Rc$$#a^%HEu}E16#eph5o$-XfJdYZu;se_RM(l-;VJt*wimej
zm?%5I;Nh}a$!+}fhVT(a72|h|03jgq`z#~#t~Sy&5h^|j4OG){(f*$bs@xj=GRYsP
zAzZo@+e_e6rQd-kzSDzD>UoqGEA+ur8@LM*xdSvTDH(PdK|eSFNwgJN$@@Z!8y{i*
zeuyDIIPqX!fAmliM=8PGI}e}ZCc~oTO17@$Ctc5zUk0yB-Rcy^eS02<S@5IOC_KTF
z{$lX((|D=buIDS$Rgg$8fwu6QfRO=inks#}=z81;tJ0{_0SY`Gqrc|SOK+#s;RO8{
z;8t9x=-N6cqf<bxB&QO}QZ9;6Wv}&NJ5KXs;Xo|v@P`TtztIy{u@-xNbYSE{;<XaF
zt-Iha1ReM>8bx2gM)u-!6r`9d0R6L!TCpu0G(cj$T>J37-`-CFpXK)mJgBFItxI=W
zpR?DPbb60SVX7TvTuOW|fZY+xy{<3BAv(5g*ab?rl<)>pdXHjWezWW5FVi^bG@huQ
z?7j|9pzTyW>xt2AlwXnzxSdfvOVO7zH%1n${dr@FN*e!PU{WgswUP)%GXwFs#ZLU4
zP>soM^jj<904JjJ?D}+Uugy(aure3?*dX*Cp&eO(o`R5f9(UF!Vz$pKOQ&svGzOcD
zR-Rcc;_;l_wMTL!^Gk~so^`oLFZfuE*2`F5z`y3(E%B>pH4BYSrU#LharLK+l-=^U
z+oZQic&@}`Y@|vQ-;C6DPu*EQBr))-tlD2rDyB&e&}rZ-GFvX?^IDwkz8CV!&Zyk{
zA#8w6q6th0=U!Dl@EoO8AUI_vZ_@O&@se6*{AajpGgZYSYgZts!boGUGrM?awhJjq
ztT23Fefqt?gca@aeISKQNKYhphFDjBdjB@fT_<j2#A7=-dxx9;^MI<zOoY*=00P14
zwm|<ahAj;ECZi#xBM|xM)nTW%3(7^B`Jv^F2<(e&gJZax|3|CCE=P@DdmhoX)2Co(
zl;G2)p**orF1rmq*_JX~O56t`fs(r*wLR4qTm9foz_0VzjplY=9~e6|x58<|lFQ~N
z94z*@dYgZ=sVs~}!!XDMP*Ok569JDsh4&xY;AAwgHG*u`OuNgUjQsP?ZCS%iT1VeA
zS*)4VmfPZ6EeFux*b8X4Gp`NG&drV>LRV}lDzMBQ%NA=TuGQsq;fb3-1SZPRamAt}
zo^l#vr>;yw!`N0kBNc8xf*7BYrXAz50|0`l{qa<i#&ZbE2)P)y$ZVatY0W`j5RS(I
z^A8y3%l<S>3PxIqW5_llm~Z&J+K@1>@sL=8Fq6o;i9Q!of+so^NNu~H%|r_!q2ZKB
zKKOunQ}ZWvjaD6$B*s6Bsa%mO|2up=dq@TV7BY%*F~w+>N~Gnl3fN+T2joG*P=uA7
z<5XsSgStIF0uDIY1sF0pQ}{ZfSm`p>0UhvvwsGDA%@Wa#N<yD4T0;Uk5)}MYRjPD2
z18{<n0s#gGk57*Yub~>D$MM1CbRhS^NI^Z&J3>Jl<QAc$7<KgVdb#L@V{5r4hq{gS
z4WF~5SuM)Y^Q#XNGaUI=czxK!6~8%ixzubf$4i2dRDi5Gl@^R(98EX-27%+rLKX2>
zd-zVQI>j78@0CUiw(ciTK&XFV8(@5Ad!Cd5h_jzio=mLN2$tou@j%#rSS~xx&$>yP
zp>Hb?U2xd0LZfP!<XaBVeSlA*7XH-v##%DkfbQWEAvu9ho~_WVVbyQ<%K+rEfzR{)
z)7c%iUqx%XGX<!a0wq1v7l|s2su#wK8V#&-hfAUeh5~cUhNg=CfS=;q#tATNG>;GA
z;B`GK<tWMV;l%<my^z0?ZTF!iQ8$%LLJ~Eyib6d>VBTNV_`XN-MNqy1OyKSmGz%y3
z9}gPTSAk>IX++qiKLSXPev2)s{;c>ZeIGX&Jx@U^Ak*Y4Zj?Ja5jrcGgJfXt00Yf}
z2&YS<qKG>L9siUoD59|G3hHZ?^NchA^QO)AVZeLRJwtL3Lja5hsi{HTQ2C0oTtRLg
zUEG1RAbq#!KEs*p`C-l6IIKWLhT(ZsNXC)@mNYpj1j=-oIcINw3{@p?{^HQMT+g&3
zeuD$Z(xK6RKAeS%3Y=Cpn7^70@_3Bv(->l)z8bNDU`U)f<>M2s^!R5FYs1X5;iA5A
zBriyurATBv&D0@aPm$28gT*&Rhm0BeAhB4mZRVi@w{jT+hu;N4_eG68^_`Ran$lQh
zKY%Mhv&RsX;xFB(gI=60Xhifi&kmpkv_FFD>C?>us2yj!J9W0wu6VtZjxbM70FvFl
zmmn(@Sm5UwsyUqe_jgc+Z98I?h~SMfhENJDMj+z(LkM#`>${}w)Ngd5DBIZ>=0eFI
z<~xMP&&Y@I++X!vmrbcdlok1}!GO*cMt`CZ1A%V<R*gOb&2S@WIAg#I{gsNRy<(y3
z;0sDB6s8l8IW^6+c07&gl&Jiq|Ds+6b;hyS{!!%$gw#bgSC5nU59sOsWG2mo$x`Kl
zsiIW$xdPfuC<cxo+K(j-b&7Cy@TMEJ8X=~XF8=hoGI3G`>tKft3v*~7qd&2|u#CJm
z&5tS==qw;~p$Z@U&ypzVU=Xv~iJUW=ATS{#IH<9q0E9UM_<;I(NQ-+R=!H{(Ay<+A
zzzzq3R629vLY*N*N<k<*Pp~AcNW1sHc1qhw495RbaNI^F?lkTsZD=^FWa0?`^(+Z_
zY;a)acPVy6g~e>~%hI1&pw~L627(CfiqV_i9#-wzo;Wuw`nd!&h)ib7RO#-a*O=rD
zVad4)u#YWwV!P#q0bw)rrRe7|+X`+cV}GFrz0>EsL`r>I<EYQ#LPX!ASgvMcX3hD=
ziKf*o|K<zwa2w6#z!j-$sm<(1iD>WDSf)~4l4li|GIRMU({2c9`?q&p44r$f&#X?U
zKeTHg>)MwfD7!a7EU``8uwh^RQKH@8XCY52MDJCF-m4n-qZh8r_bjQ3u60-c;*C^r
z%+HEufF*{;MI2_UOdyXxbA-@FxQK=Ai^IgAxW3E^npctltF9M*$63*Sh2=ABWL2?P
zc5mpZ<n|uP2{W0^jW~CuRU_w3bN|w@)<bAV6g^FAp!u@4h@C!Wu&MPDjjM^ILydi@
zT~uR?*Y~paC^@6&P_o~auUz+j|Al!hEj@{e;9qg{k0o87;ge26N}nAV)wdVwh~~^H
zmvGIG3i{1m?DtE>kJf-3AMDr&`G)Wo6g=XepRP4P-nN2m_sd$^;VKc{`#lj{mrn!#
z6v*Cxsq&O?D<Q##!N}x6#0xY0Pc-Q!+WhmzHrq2_mCu-V?Q<lE8&73_V;S6rNAS<z
z%Z4~<^iN0ZOO+G~YAegZZL!6v1V?yk!$1ukW1J36hsCVZjfnK|=aqrXI9tKAADtuU
zAL7|{-WTqQ*(CHSH#4BoUu>Iz^MuZ`1#w7PlFuQCEI0o2T~CMN_W3XeNI`sjkbrt-
zwC!F3IDhAm?&Q2*<YS6mkhsh#^F|6{D@sgHeamYh{x41>)r5`ZxRKriv&f9ygZLrG
zB5P=kww%w${Ve7YKE~o-D%VMzZ_yoKzCA2S?yUw`i0Fb(!iIE7Dw{L&4^Vc9dI6Jy
zOwBOY4BcUW8bZ-XJqIu)d#x(u{}4-z;*hG`o>EFw8ul2R61-6|Z<^Vhtu_+k@V%}Z
z0O=!4w?-1Z<(G!Ey9Gs|_eT3|QBpeN5*S??<jw{uRE)JZpdE2rFV#M7{CqXHC(Aw0
zm-AYQlsA(lFlOz3yOF&(HG--lQ9YPAy_+C*c(Ai=80ShqXSdtn_jXD-)2!4I(coS0
zJ<Oi`VF+ze3=UULSX}5Fmgu*i?)#QVr&wGD#BQ`|jr;|>X9-Rgb43CjcK;|-o}=6X
z1wIRi59s`s6y%>dX#_~ql$m3xK^HGG&vp<tMqy0uhTEq1F?@#v5DBW1YxH<~1s*zp
zT7EP9%^x6jTf3f9Rh(zdI!aI!d=5%Vht+Cx+y~Tjg7xuCQP?(+!3j<7^1KHO>n`AD
zQ~P%TGaO){UjgBzg&IR4pX2zBvwCDiw6A+{z{Llcf=^)@kHZe|;bO-}(QctyZqDmJ
zaZ_QF-{gxpHtjL!`?|U*C2=b)(Nm%fPwI@}*7yrC?GhM9OeO|_BO&B;FqWvm8~)cC
zaJxC$fWI>=#f^c;1hATp?GGZ^y4jhe+2$ep0gaO<Gv`ktWxo?nH)9~InkNc-6FQ$>
ziH?!MWh28W^=Et{i|@6(eU2g_gW<p2lG<{;Y1wk^x8E4lXCbP3Q|#%Fqij9qiRF&_
ze<6vMV9<^RQW<A@!7CDIVc6H^#2Od9MDl;8>#lwQ4DbDMv!=ln9tbZrS!vemwAii#
zF`0D$L;`6Qh-3*;i70|;U}^x`J@C3me}W5_pKGnpmg-CbmbRvW^Iu{Y$GXC0-m>nx
z%YZVk))GqQDOEz_&xOI|axzEix|F9<Bs0OMW(n{<z(|B}0)!$jpzu5_SHZU}z?5R{
zP9a4;MYs9!{(38=TG}gc{Q7V%s|Z12G69<mKLC*>5ie9*99kN36|Hh)<c#9zr@W@u
z<;f|4WFMFPSM><sSHY-NT6LfvXLR<Gz(I4iutgsu9D$z?*40g?>Vl(uT*RPml^IS>
zF7IkXZNV2$z%x}2>H7J&a4=%p>7DF-s7zG!^YOxM!-Fmkibm+|D)9Jl?fbTG^rX+@
z^~q1%W%pPp8F(62!J20vLg)j$m9x_}1FwU$A4;Lkx50*bT)b|b0N=GI>FzKuPH_Ig
z_0nBauz<9C?yq+j+(yBBNK7iMediAVUX0-c2tg&A@%zOg&ruQs(|iVI-uiBem1lYK
zI$*YlK50rGNk_7kpK!<CZ}SU{6?h<cAsDcSw}zw;n8y^_^V1;vViskV`9xa@y#46M
zgkpXo3C-d^N$_!y!0(eSog;>t>G+qSF&g=f(W}rcfo$E#iK6@C#VX4|`UPn1BvpLh
z|3oD!3KA|{A?fY1oL^N&=ROw^kDyvE*Y5-2FeAb&0@hAobSedH<Vz-?tLrpdr&;D}
z%d+aoj&%U>14ys5BWpYNlC>*)<b3(wBNLo&uL`QbO*&D=E|2(|$1;aeWe+foj-xk^
zj|AfPCm^gMxoMtZ&Vub0?<9<#mkUsZ?@zt-M8;27+e^lkh@9ZV0;rL<*4>z0aV-&s
zR@Kjy_Hwp(e{2DOXijt@?ZhtDm{j5yo1(%>nvhvXii65iu2$v<jQWZHhU2OHX*rWR
zIq1l)`;d&HQ-Xi;hUdaWP_wb*cl{aXoK{h<Zc6*|_|3oF1t=3w^V+A)&Jo?gh`p|U
zh;bt5!tHpF-^$-ar_)$hNOgSc7<dt6#eehR7BaSJ6>wNBjLmEXP(Zj4MJ0**u^QZ$
zC-M3k3}yjGWo=GkmQ^RX1Gr*<{nH^OL`o390fcJeSsUdWBb!gT-PA{Io@7^D@L)gu
z4}4DNm|59l%Gqm<-tbQ2)O1H3C=JH`$kuX1V-W_T*ZQb{@q~1T;S%QPtNTFZ_&q^x
zp(up)G^<(r9dm!3f6^K}?MsGm#i<|J;Cu(oMU^#7@X9vmkKMNHD{5rIBD*R?le6l`
zX>C>Q%5)l>F-;IN4%?`K2wdY`RP~HF#}3B8pR}|D)AbMNZk?{au!Y6G-Be^<b7?!&
z(G{jSc2?tlsxFOp86>T-)&8b<3_)K7OgR=GYR9i2!Bgbj`=Q`#Rt=v_vv0NPi^2sg
z97@?br@~NERq|BtMcNa{4*Hz~%TUUO)wExj=&=*eJFPG{cwW}->UQ{zmZ^GJs?DX&
z3|rl4VvsoF3$FGzsZ+X5yHXpX+*+g1*W|oZyhS?oh+X?oRdId1^`;?KW$Ln{@GFzU
z9%K;L;yXho-UROeabj$EmFXZ7Rn^AAwo9rLoESD6bCMW6@UW|bkwL8%U$-IjAyC&n
zN~@n9a<%?LEBu#CkTLw|el>-&0lOXJlt%~Y^Vc3APE$DT0rR1Y5vyk+CoPc&6bfp&
zLB$y^*dte>qa6`s!_wv%hHasA^Xr}Ky+*Xy0p53bU#Zvk=W&OP${rX5Ihb%lZ<^dr
zR|cp>BPcuN#M3gS6x<jkulJYxDlCq0CDciT$HZam*_ay$jDaI(Sp2pw_cM2s6@5`;
zgT?^8A`IeFYY*lwSC8HrYB9&&Dk>Vw#2FEYuT$ax1Z2yXd?Cp~X^9zl`x{KXNA-CC
z3p-os6Te8rE`v)VT8XU*R6!Zt2Nf$_9lgg11rDR%tDG^`6wLTSF|DD`GtKjsnguwf
z{;5LXv%6*iCx;Rr#|Y*h*&^{9ns5z-@M}ls%&G^862bm_SM0paSuK{&`G(hS7i(=m
z8!A&c_pjrfNq6+XL>6^mkNAtsjWpz3$O~%$FV;i+ix!OH7WB~?T_6z+glH-XC&SHK
zF^rLRvmPAEO6l|Zrt-u-F}ZKCr?;n{3Xj605C}K)Azgm~6$T^Yvku7TG0XIQnP0vE
zV*rh?OrwfO8O~U^hQoZyPX*ytYOO+(&8G}KQ`CA34j)%=hd@Uuq7ag>23tny8!u>3
znNTUrFaGZCcs7IE4$T+QwhZN|z<lfhsAS=9?m^_y1Q=g>29P;IO9pJ$N^q3KeNzQ~
zav`Wn$%zd|i0=E%5|;iroXF~fiOSDT5{EAH!+}6FcPvrJlB$&j@3?;J)JRf7i`j;{
z{S~5=Uu=_zeoo3|P2hk*Q2}%on^4L*6QI`{Nkt${{UX47799|uf<EhQ11<^C#x@!*
z3wGAGU;~Hje(FEJgNw`N65LVDD3gKCq^?{V8KUlfdg=S`wKFU(0__~YCy^>ZCOEj0
zvsjd2MJU<_LUAaTToJ}U%HegoYly@NMF2f!&1q7AJ*<SfSP4qJ4|87hV-6-L?`_0C
zA2I9+naM>I3rfrprUj?u%icGp+TvRVBpO1M5-2T<TnQ){Wi9aWaBR<ErW4v%lLC2G
zbEubOdoeNlQbMG6C$PEX422nQ>{;#u+je>q4y9T9Fqbm-Q|>1#3Q?MEA%Qr_ROOWp
z_iN*b)1|sypwdb2A2UWgmr)yFiu+l&Go}4<A7C~NGbw=nrA%orQ{t||B@=5H9X%6m
z-prMi&m|S#Elx5_1+|55=oMcr%{IrYVj|(m0drKQT7q`&4{N_EZslBslYPQ2R^QJN
zhg+I|n<x4#OT@QD+FdXi$5d_wWQR>+sxTW$$to*>ac?Co(;t?-pX@qcfg^W?fMF%T
zCqMS4eIia$$V$@^-^H2nH=Em0#~oz3e-7AOrmB8=da^f3v@Z3C#YRd9$kg3PI?e^r
zDq(z`oo$tdvI&k3hav0~hqA_|$aPt9h)Ck_9ZUUGI8A|Fw3};wnKF_{=L^I`uL!-z
zyx*v^&MLo&wUex49Xa`jf@yF^t;2aoPKi<TI+=Op1pr6EoOr6Z<r?3V-f1^KtJRr|
zVg<dfPur^+2m|-I6;02WT(}+2h-afRjN>aatog@MQ$beFsW3fl0GR=;1t4W!D0(-^
zX0cbV#9Cj1Q|NwN^sAiNo%()4cdrap;pm%5#V$=L<>%SudtuZcvOk7rh50ICO?o5S
zA$iI}xn}&MhqK>Y7}<7`PNRKUHiK7Y7N>&;G7G778HG*Vvn*G;xohJ?;&SCPxcJ3q
zh<f0C&H3t~<kSd?Ijt5@I;bSd;4SM|$1G+F5rq%SI<41!^rAYu%hLT!At3Y+8OSs#
zmo>!KYZOWIsDH^n*qMJM;>*9DK|R9t-HJ4XDZb3)Pq1u~^kLwwMOi-8kESv$pmAP{
zAAy!`E|$e_{wzaiSwd;^B`I1##c6{AUU5X@$Kr1*J~0DS9C&L?Z!V(LzY?Rr=h*HU
z2vpRwTI%9aS7(=u#pH8{Q-meY9Bo$DwMz3@@|{%=NlUXWd2nmx>ZgT^KFJT-<VhxI
zf_FPV!4c2I2hY}j#gENevJdOI&k%C{c3}d#8FT+FGw~XfaxZ~~MP=qgVJX{OzmXeE
zj)CVcX<g>Yi`O=_dO^1vt*wog(qqV-5wUIf^hJ|-V$5?@kIwzn>9@x&=z~3Elu+e%
zS5h|Ty8A;H;%w+jcXaA$M?~G&+2IU%NB>t_;QK<To^KCL&-h1fFc2W?LY<>6K5xyW
zZ2COiJ+<_+lC7OI*(mb+plVLu$5e{L&<|sOw><-{?6<s<L0j1$k6*rusT11C(f9SL
z^*ucwE;KB8Ii4Q>I&I;8%m=Jn35}ak`y}>W-Yf-I|6x%#q#c@xZd4ij%}c`YZ!)?=
zXPpy!R+##U=+)>*c)kV&(P{1yD$Pg3T6HJuc1fdY=lJH|lZ?&hsG3gUVz>h`Kbs<L
zqb$?`Q;Sv_KwlJc1hdepRChR)5hf!C0G|I_zxUk-ID__0);DM~G_6|<F|f5%)qUu3
zY*Emg0IC5r*RLxA$*8+Ie~JJCNZ1f6Gu<Stz%4r<Onn(gDTd${ZYYdCxQ%w&kiQy$
znBgBa^N8P9Lk7q^VCf|6P!8f5Fo?E8tzPNZR77k3J?H%E+sRc%sQWK8oUfD{NCC{j
z>&-U0L5!{ZfKK4$_$aTa1}XZ%f;kRhP0Um8ftr-YZAUh}4hSCSjiktwt3dvG8jh(0
za@7)r{l|0wX#!2Yj2f*IPQ4FaVYBDoyIsK5fZTvEP4V5N`vHylKNtO1jo<XxSy-`9
z!ryXHYQe0{4C!rRTf*)SKs;cjJDmcW#c?|rKOYg{3PGJ6G~nV&4S59;X#at|Z&t7@
zyoJRXf;Jm|?atDAClYD>wTPHV%dp4CTMf#Q#ju-S2lBTFPp*w3JA5h`uNyELzdW3G
zn2o0chIK44H(C-#cL##jux_H;(f+GMAxpD92bXx*63_sRr7n~}j`MdS9_+bDOUfLa
zeU)*z55ZSh$zROI2+n=g3M5edioUpivPp_m5fS=k+iY+2DQ@&I6#_rHQuk3je<7Bw
z{Rq^fTYz%+csHxq(*0lfNq%+uL)udu6N#%rug#I#2Uw2)zJ2_&gVmL)wM_r<UX$<K
z%9;Y(8|NJe0({cq`Y^k+><>i_F^gmnIBLS^WZ%$Q3i_4m@I4l56ZUNc;N`J}*Jgl9
zt{E5R=K4MCyH1WQ;<AnVoP+hwKpUK)SB+2a``5}ipWMUFddcYfF$+gi@4N@=;C~B4
zpt|W2JqNQ0zQXl<jWTS_wN&sDc2VPzQ0Ez6Ml-M5cf02k#?pu?nSX>~duZP6<Hr{d
zo=Uhqkip|r|7X{%X14o$irQCHqD~};+-mQl!q9qWK=OHjO4C_2#4s{jIQ0iri`NJE
zc%s)n!}_Nnn=NxX)4gZ=I1&EHpNur>1?K0)2V0TpXbrvTXYz-LYbm?uQG-gT6v0y#
zvg@x2y6v}DHjnZI%lQrNZ(eWy>oC6W9N{KD>hBza2#(7cy^^-!g9+*zDI?S=iMRtp
z{&YGgPDTy(iHk=kfII36_^7+FLO!NoUi|3+yCNd%_wVzOrj6_W03P6Sk$6!0Qne4@
z2-$|~F`=>|AW`(6Q|LO}$)@&GHWsP#{Ac0Mw>2+)b31Kj8$>U9I>%bPeOBaqK8L!Z
zqngbJF!xomzae)Z1xvc1w`Y^({9pIOW;0`%#yN09+m=*lSmdLvR=tTd;A-mgE23Qg
z1E>c;kQ!GSfLIKm%|&DtdtNU(^j(+t55x2t>HNl}8xpYqJfSPkIe&qeK7*2Rm!eVk
z-x>p8f@Ww4wjTwur=2y<Dy%U?q3ukyUAz^US53|76bC#Vxm%j%M2_U>#0%3QUm*;f
zA_(A?*hLE-m1Up}C=<KTa?Vf15TuV*o1~e?r{cu`Oi2WpZ&+!_g=!cu9^8R+6=T#S
zx-#v|z`}!EBQN5`wB?hS_M8TCiyjANJG-D#ymixB^4dbRzHBUjz{<hGw6n$X6{;mM
zDFfw2>6uKlN2@<AL<cZRn#fpr35|h$20$#M`1&ItnvJDiAD85)lpx_UMiG31k{4?N
zoRSW&=bOh(U&GNa==@i`fIr(Rok***06dUOg|yE_fFA`6s?%OL$)5p|;c<I#9LLlu
z@qr*bTC{~w)Mz<x3Fy<|17O3jfX6^mdHOrBuO%ZQ7K%p0{qM+qL-Y@CpTVe>;L8ye
z87cvLE^z<nJb>&r;5p}{909er8n9+{s75*fAOgivXg8fd*y|4sOt*s8OY9K^H~+b|
zUP1usGJ<V70kU8~d}}1gU{tkU0NBj~Ead+ZP#V>GX>Pz4#2NrktX7i&eV<u=gI6VN
z#`{(0hWM)^HE!{<u+zuebLk1NBBFwaSSqA00BpsW!@kWKi2Fg?$V179w5iMkrj#n7
zOv%4Wou(7uT}<^wQM&_}qm+LiFh&+~THA^+KDm@@=eq)9>0?qYCD8)lBmyb=Su!O<
zpuGLJ5eb}$f|Oc<f&UgEu3*2-Qg7rtP33)~f7}GzYTvhAat;;tP&a!>7g$<hzlrME
zzf7$)gkm}&;D-25UWGhL;@YWX1W7!+J^)(c?aN*qIR|(^fs!`ImaIsxC~Q2+91(ap
zO~rgs-)+4pOW8b9gI&pqOc}e%CGG{BISi3(57g_M3&7hJu>nFDQlS!ijZg!A-^-D9
z%KiWgj=&<yde=|43#s-03?$p$7T{gqpDq6ntDPxAzF(Xc;y^OV0hB%Wx-;N^uJ?AK
zP36s-pegz>vssSfElFh=`o7--n8W{U)wV-kmUV0Xzs}O~{Byd{9CP1gm@;$<qE|}a
z0akbfaLbB0YW+@QNcliN%VA%Aq7a(<`FMxWF&**{L3b8UMN}4_r;+S9eth$K>nI9!
zj$?F_`qR-~kp1Wl_ALLc;UVDQ%pdL&AaJZs6C|SkUm87Y^)KltI7nb#N0ujs6=rr%
z?s8Efs8hk%QTU&~xEcd~Il+Kx64EfVKv*rHOTyADDP%2{<r)d#xe^*GA?QWMPJZ(0
zCUnEw`XRU10^Q1wfHb^6*A@uFlt!i)#zDXIiYHc?!xD&geS7kQU8K;8J*w_3!oDnn
zc2iS7JuE5^*E@5vXrgsRTM9tj3YSn16?2%zH6n=~_?b`U%-{pSDy?G=d4&8QrxgO@
z3wx@KXmRjPMuwQ!UuPMlD>a{BUjZr_ry+X_;#QX8&^jE;Q+^)ATKz=?To>l7EF(qE
zBWVP<gBh5O6+sYVZn%`rXt<Kg24mAamcY5S{mXGlA}((To_e{O1#lV6nOSf^*gEo`
zFA~32=7P`ASP?8*rw|_sMdtG=FmMSIaL=F=3zhee-G5|z(3;_}`e&#rd=*z6GCkYE
zjfTYlLdIgy@pM^u?;@na)GQ#Ufk{|*C=Z=0I3W>YsDKLIYqI&*3b#h*W8r~8vZjak
z5s6dz-p~3PgB1LvUVk`I4@5^3w~`E6F7IWa6>T0t_~##HVG9h`8MH#&5yKM55o4>9
z0=x!vOFs%Ybyzp{hGiD1n&K^IC02Q1p}`tJ6vJg&#KM-!5NX74^ttH<X_-mv+&v}S
z%<|<pzA@Q0bhYAUSU0v8yC+?$$TU?6kli@5(*;RiT&KjDDBj<2#UsA>K)dX8krHcK
zhWw#J?tSZ0&1~6Y*d6C*<Qi*;V?M32x)EC&P+$m`n#8XvdMrWH-U-N;9HKKLUOr88
zr>JHZ92hrdZNk6SbD39f!_ESS2b=h$>THn`UJU(C%M@3g$Z-1Zi@dw;!~D`z&TIEI
zA&26WMf`RM$5C80z<+3b33@}kj}8rA0PbBP)A%PthR`V$m9BGHvZL^+F_nK?rw|Ed
zQejrBt=)1k6gKjOzL%00SNcOSsaO4VX*kv^F1rDN70#c6lzA9~X-J>t{L$B>@GPk8
z>*kLpf4<cyUhG(US^{%@kghZPoaIqx_m4`~K^wmjLuLeuKcdSXQEmMbSvu-x?=#Mt
zStVavd*%3nu&Jh@w+pcAR^7UTM1s?_X&HC_$F~ylqZKvvzeUvlcDfk^T=D-+f4s=n
zs&SB!XTw99<h5uvxk&zGv{*L8uX)89&UD-BD31{F0Homck5A8~&U^>T^Kn68+jZf^
zjoyufo7jJ6LO!svII-=X4m!8{qP=sa=-~o6V;Fr9ZBs_mE?d+Y^dozX^{DyT0xp5w
z)t#3<TN04h6X6%L-cxJ^9)DzK=<%sP0x&^AUhX%kCL|o9@&r|V++O(S=OTK6_u^^T
zY#1~<Nk$ro+0wCg!E}mjL$|^kckXM#_$&{HnnQMp(5_jFWt81tK0b?(X8U9KmFqTH
z;*ue{P$1C&dd~(%X(b?-)^U0%i_4rM1+vma%Ja2fIC;t*n3Lz59#r=*m3i5AK5g~<
z$iF8asC!Ew*n~w7NtprNl=O=d8+@H$K%-@Il=nO%vM~Bi8?k7wy_NA`NXe86u~3Fm
zeGRPpp<-{*EfQsc<N`w-kDGagRlMW-k9yC5ee7AC^q?y_8VH+KKN$#6nEwM6Kapat
z3t*n_?(}I4@H_4e1HI%I1{(Wz=qkt{b-u-J6G)3qS-(At1j12%jewQ|R`EYa57`a*
zf@jz|ub|Lwz8+>$xdy6TK=WNeVsG>KH$Dh%LxmZ^OFy4f)Bq*Vr9TMK+)Ot_6(ffc
zDAkKpSV^FpY<`a$?H^g<*nT*|hRxQ5Q{a3ZvA>2p2p00`?0{=;O><eT+Y-a|ary6q
z?IWUc75KH_u|rS@ML9%Br(zm^v5JT(+5P8SsDLG4NI6Kdr^q2#zq*~wSzK-PK_vZw
z0#88@U$z~R{r6b2fH+M;EZ10GSK*#u6R1K}QJ|^z=y;}w6D+rGF`)T<vK=wPB9E+1
z%8rWtDWAoKPCgxczKy>&Cqvk;$;&H0F7e9N31Gm8t!G&@Fbx8_M!t^`3~%_F5#i(U
z<I|PY1wi>JK{SLlv#Qb*_$b*oGM5`&3<|{3r5Y<IVaPt`K09h2GzG?BUc2t+;u8&w
zEXPT2ALIh3a0`4p3q6u|@aNvXjuqP=+gvTV4wpa(qWl?kyvKQoBuErW=NSyxqiwW5
zIvMnR-;$8rq!eq#n!)NfGfIgoMAECanCrQo$Hdh<LhW-5gHtBES5e)v8UK&Hw~C4*
z>i$F<5AG10;O_1Y!QI{62@>4h-Q644pdq-s2MA7(;K8|-@6J5Ttoh$NFLR%6ukKY;
zpX#nUO;zo)_fL)qn!^vLU0erIJClNCej9GjIvWDnk8+|~;(EoXDik8o`M-+mxj0aB
zWcR)!vlYewiZp!IAD)Hc@BO(ZC_onRhYSwye2R!K&fy-suyaSRnasOlKCOUz?k#a>
zjn4v|pP0o3ny<QUO5PX8^g_&&V3v+cfsYRDRfMuZpDG$t7cXfkEFi3e*Nu4Y_gif+
z!Iu(GNVfV1^FWn`%5}rIjRv)k;tU0v2wsnpkKqwTEe#h2`m54G?qq1mC?OA#U@SnZ
zf56o?=OKT`>R|&?tp}reL&3i}Je0J$5}YFRs!kp9?fqIX+yHk|O{B<i1*qHHG2))H
z>rn9x>+2o$^9)j9PN<m&rqD1q0YmFZLQX_G<Hp_w>rtJOT+j!~KgGYqW~nlo0hTD!
zz1+i+7I7vD!bZCjGo`c+1$hl1<;9YC)*qEwtGX`jy!duH`YTzEDTyGSJ#w-^mL|YZ
zYXhCw5e<0+zq%a_+9ZubcfC*)>SE7sVz%%et@#2<vx*G2N?W&x8G{4uF6t0;;ha3U
zZqfjtT1;D$I`*ZKFTa~<IOn2nodcVW4W6{E{a-c9eA^EthoeLg%jJI89rrf)NXVMi
z^zqkn^y%lm8-+NusgP#GwQ(nBl>FIadK*0nU^*Ha^olApt0$1XHOR;nO@JYPtGZ^&
zFW)cTBiwH~&H-P4`k~uuyT%J?o1JIOY+k9Hv^g{2^@m~)zP>~;HKgM^5#k}{W*aa9
z{A?zGWm`h~^maCbbrrHd>BL($O5=$(>}^>|x>Yzr(lR!@XLcXWIh>sx^_ijBS!;XB
zkFXMd_yhgAx7@4#oI}*v!0;2>mT_Kz6!Urqb>FQ)5C*)-L-SmdYe*G6-)=@_k?wxQ
zoF12La%HJ*^)EavcX~1{_X&y^yjScvCe3>tr^~T`>^n=|G$f|Si!Fw{6U4Fd;!dxR
z{RQmlSC$_sslbo9tt)^Mx4tgiQJSu8PC;~zG4=fC;BoNOcH??Ao3q<sBzow_-%Y)`
zTwr5zSD33YQv|`;^LdB$Cs?_njxld?gHA~vr3zgr4U&Ly{oN-33LBZMl6cd71v_pw
z8r1tyb;u~_!lWk8vh6wW89-|9Bcks?8V&)@Bk*MI%kf|2mL03ttaEtJA!G8|z{xJ%
zE`8oG;16z`{NcD)E6%+vFB~NR^2n6mD#1;bz91h%o$s{^C@zb=Ghgz^=A9Aa1%EXj
zPS*l5*Jb6z@<37*wmCx3)_i8Pn7%`&JnrJd$DI<#>}GLvXna1!&s`)b>~GNUw<_v-
zlnYFY@EByT#gZ|XBr5FL>*Ao|@7SF)Ey0%xn&EuPm~l+5ah{UL5^QuJZmc(DzPVP#
z`631kWz4Mss|p)^>kEiKs=4Pr3L6IdOP_)VtWRMFz5$r`91V<6!w1a;gs`}`kwVq*
z$b;trL}q39VAp+F!OM-t*}aj32%_vBv78y6J*0dlohE1|%n)T>d|uy&OGKuQ9Uzap
zSZ}2d?gKDNZ#jO?A23H#Vw_~=0EqxXksngTKCm9h>)cJD1Kpx!IDA7BVUh7em1Jch
zX=Fpy*6p)E(Dw=jLOsCn%X|Q)mYS?EVY)!L4+tN!^41E%;z+5%JAmj{e*Ixt&uI>N
zR*L;(O+b=mUn$H+DDPuYFW{yTXbEWCpzjx@X<Li9o)TE#0&?+#wYG+aiev@y1i!Xf
zzV-(JaQOhB%eDnc>~MPgR`*p6<pXr@xOr?K(^>Py2tx>=V=jR*l~hTMD&g1Y=WZEp
zk#=;Dsvv(iqR=s#5C|dPxavNH!B2dTOi~ON8jSz9=OA70vVZPHMukKriW(j28^jFB
zs%0^Ga3UNX#PmGux)fyRfjaI*%BR@n3S*L=wxFhpS9d?xk}%h=trH(6VZNk3drP!r
z8A?u<CKY^GnT1%yagd;8n!jw&Ah|-1jW?lS{aYmhfTVAaGXe7m%Ec}|3cJPC9Emb%
znsy~N!T5{Rd`O)b?`m-7+kljl$hQ#ri!$nmDA{V>&6W6%qo~d$FrDHZ5$l1d=3&;f
zc{nP3txIQ-09AATG?B*BodFyD4w-v%7Ep4@mdX|qzA1almRjWlI_#(4D3K2NxPLk8
zlT>N6e!x*`Qk-;gFSzoE2~!1z!u+F&aHHk*0UY5LgvwylTY>;l`i~V6-`4>CW<S0|
zyrPjrmYT}CQW@uYsu4zFU%3;+hxu8jV^-rBOLB@qRMS}!0kPprNw-yF)<4BRIJhyf
zr%v_zHP2%Zp6zGk&zI`GDP(IKF{h$s&-{HSSx1yZ%h5kkJES4)uoP0v9{z2~eu9#~
z4Y>M5Px`DOksJ{tB%B26fk-x%s0@@Eot96u8zK!$=f_C6Aq6E$T09XGmzb6d;}EMy
z{FtoS5I)8x!y7}QS#v6!QXr#=?)`3{c_<9g)gTe>rn895Y+nMxNwl=*+(*6?6!Rrb
z4R=V}&&{l4>M)CHjQDH4eqRYu*3gkv^t}(#){gZ_N<U-(Wdf!%xkTs07aJuY0q58Y
z^)CU(eqILnXNEvwrD)jdMB7=xQrpcp5pNu}<x?y`VDI<DRv?-8w{w;Jj{LBEYc?gb
zi}G{*i!c?OtX6KVjya7a{)EvcdGwDjg_bNOY?t_i1I2TRKnk0D1Nc$U6sSmZsIbxn
zS}V+yeCw$9%b_J2g=E&15Tz(5IA(y-{;p8iKPAW130?ll3xNz`JPkpONlJeY1`zch
zGTN5?IRb@Mv_w8BE5W=|5{r(}7hidrwJC&nBxl^DCmxp%KxchQjgHA}(qFY<wonmu
z-;D_S*n){e9dE2C(d;}vKGaJgMo|@N&tY!5L1a~ugd}&iYiy|JwQ*`29Mhh^9Clt=
z%UJTbB!-L|7yEb<Zr|lrBfQmO*-x&^wzB++-^_e_Z^(5hLc_i!eRFoV$Q9P+P+66q
zoD@YV!?Jngo1ZD8+}p*y!PYTQj2Oz%uopcYr%dy~?yQol0A_siVpR|4yPb?I@3Z%}
zVl#L6Holq7rxf<Hq_Dv^BD*AyCW)ck6*z{Y+ICE}<s55OWp_^sdUbL<00wKMWJ)j4
z%oW?-lzPnlYvMpRE+v8S>u)+z$pL@a=&DI~f3Gpo6@<g;kL=W_ip*76rGVj7W`OWU
zfSR~NFh8Swy-JkxW?kYoR6J#C7s9RSz!1NjGkep3{}DIEMU3%Lp*dxB$c{87C9<vX
z)NU6nT%b^9wW}lfrX7<YTpDlXw&^lb<c~3XL_1W((voC8oTHz71xx%oMpHWS-XLYs
z6GYRFp3~&f8YwJ3t$XojD|bq#D|||dccXmut@HRzxpCV9anCF+^0uLzXJA9J)I=db
z)e(}?f3COp`zpDvBwojd`rfB%p<r!s-|H?SjDb98vM+E>=n2wlMoX2Z?bXv3spj&g
zvK5ki8KX+|nIB@1sPBqEkZaBwm^PTtURC+kCP2w$k;X`h^2c{78iSY}Zo!*LcEF;l
z5OXJW2h*j(bST;jl_TVm=sn(?1s&%&_mliT7ps3hNf;Ol55WEV?tBARPJXq`d<=u3
z?0(bltZ^ig;ELvI+I{z<YNIG!%OX%ZS^^9!8bRk`+C^*Kx1XX5c`kNlik+N`TU%%`
z^F9e%O%p<ge63+m;>>~w#8~*fK;HMnAb;|<c9&)CLC11{?GI>`2l9Yg-U*>qbPfP9
ze?zWCQz%5eq`BfwvH)rdw8533fss^bj><SwpW6TBID928tr9Y3=Zl>{^_@>Z@j?Ki
zJ3N5qBA)+(G<(Ri9Q*b8?}`Ktiv$A{HyX6>f)=r|<fa74j?kRxMeHyb5gj)R7GEC9
znD2p<X@oO`2%xi3u=a?==`P#js>A%c00_t;=ShU1Vv~QQ=EJQ0A0>dJNC`l#VnMWn
zthbuVE^|;FQcf)OfRaJ+Dv~*1Nk&chfXuP+0f+nzDBXShj5+r&YmWQ{6s5J=1~(*-
zua7ua<OB_WCatTI(S4W1+!f8Au9Nl}OtB^sk>3INCdI{n1A-gY5@{@<kgwO@i=PEv
zyYRR$>4OXaGm(^3N{l1jQQWBb4TN~|dz4T2lOm+!xfx1ur-<4B4qafk0fz!gAlV*Z
z{eat`O4->T2-3%p0W8E89!m8WoDXO{iubOL6|tU30wZZB(;4-)0G=7Z?gpn1=t3^3
z(wjAJHTfwd7FqoZ2~V11Y7TFc<i*mAOfXCUn?s^95+@S$AvSo}%D_I{0X8vFltBRn
zAhbyV5J+$*pz)P>%Cc{rXCeq&{?Z*o??c*PTO+{PpgGLnW%xaH{7#sWlBr20HR4C9
zhP<(sQB)Z*mSqVSLQk`Vy`lhi;)!U^JQ`y-h=g1^9&kyEy2V~lB$&sd?!4@iFrPf4
z`gRG}?aU{M=tW(-YQbaub4KAqKr0{F3GRovlPl(#gf55hH=$kprOfV*D39t=kK;!E
zJQRZqSn_-TM+PT7e@0Zv?3S?_I4_GaW`GvGW%MoTDuHc*MjQ&nA4xUtRPF}MjViVm
zHjbYz)!n=YrSrDqfq}q$!pYQSo@){b^E^x=>85ClyAaT!KoQJD;#VawKsmS@CUEMo
zCd)db?IC$q6(VavJb=`}N|5^Sd97T50126<$eK@37I%4UgA_s^68aW`4#fV8fLl8D
zBLwPak)Ovw`;(_Y@$FOAu)i_}Ujb@z)%>G@Zde(4;RoWoM@u^|3h&Mu^%lt(oNsNI
zbB|>tUDgt+Q6uq08-RK-72<>wX813?N{Bxe`GFB2FnMiN3vftMg{<Xi@X?ycddWww
zLU}?Qae%-utd7AE>O2-;@(1GF#SufjOkZ_%e3zCZ*L{hui^-8A09aVa?gUVj==UVY
zg`YIdeWMkezq)4Pa}dH*u*v85tW&f*!dKgcs{<<cV}qFbi_i+CP2W1LAxIvL0NJuo
zO8YQU$rS(jhPN7?{MJ0&Z7DFc?58?=z!ZAPV$RA$@;$tNw%zpJgMhhW)wwTzUqlUg
zC1j8t_u7NQa~ck&ccj!NOV!ZiD%{<sjm7ohWzN5SU;j-djMdH&wXi-#p>vp3Y&Ahm
z=j7@7sQ+73q4!3TZObeC<}xWt`Wr%VPipg)JeiRglQi6KQ!{CH-h@9<&{YhVUz6jM
z_S3cPb+U?cB#+AFUleY2-<`-vzM4bXz1f_@AMQIQ<>@^ta8$U{)|Y8c>nWcoIgd;1
z1-|*F$F?(_w%hcRB*{}gK$X9r$U3CXw|*e)=N&LKm2l5xK>h)8Yi7xouF`quW6^UF
zh>x6B9TNSquqcJ`G>NWkN_eR;{U?j@L=K#IQIa4Ool&7y9mxX=(0CSEtY=AIE`gDn
z)$hfsLg@G0S;7or)II>~017(W2N_0+vbhpuq%X|xEKS>`HbJrx*V#xS_L^0yl(*20
zy_)tVTpzxDkl-XP9Fokg3o8GPyC+8Q70njob1<r3#amo9cI7P%(4QB@94=(?CP1sA
zn9GB%eJp=h-}jb%3d9y$KoAbNJEmGJ#S8PFw=C=q#dJOZ2&cEpuYoW?-ri7e-KTL1
znFe{#N|av*f9ttsfvfOaR6Lbl>jIFH(0>bRP&lF_25f_9P{}-UQOWrF=YX?vie9ST
z8biE+Er3UMjw~DePee)VwG)I-(5ANO04ZlmPAnP(jSs1$95_l6KktW*e5n(vsqH>C
zI}BT*KPQ-uIbqdi8UmTdb#NfOUZ~S3-c3O8LW6?<K>~cE5yh{8wUhUsSjDsdjg$Ug
z*k%5Y#P$DwqyNfQ^#Azpw2mdwv}RA0@~gd}LD};`Pg%L}xvD-<btPSUWnAHL)q~8U
za2pkHH^una2RMYfBn95pAi^*8O-qy__L!EYMwxF?XE8y(I?_tUbjZ8_XYbQLRz2WQ
zmFGMF&;O^p`DO?B3Pd%o+09P3f3PEP{rntyApH(hJDaAsHW&b8eyiKtD$nDel_fjC
z)dlW#Wx(JEz?{yP9jptJRil}&PwV^07J-nVRjF(Oz%E_@H1hTK_zH;M?+45Qzuo{V
zrWb&yPWILL2JjI*1N@Zc(Y67f27rsc0puE_kdDgOvhet$Zh+S9pL-Zy{TZPA1q2NN
zj|UlgE!IU%{wbPp>qxTP9J46=XQX{5fUTB9UMxUf(8>3^Ujqgjj{uYmNFM?Lk?Au)
zHV5n?Nq|F#$CpVkB`u42LApQ%yjW)f-q^DMJ4AN?ui5;C{vhJ*`vBB?o%(u=^b5DK
z50>oEiK9yaG71f#UgA1y+i(OB*YCD~wMKZ($9RA?SPTnT=WGIFw#y=|$+RrtfH%PA
z@h8CICjeB?0KZ>wH<BDUKo;U4R4fd>a+4q7Oppu9_BMqWs^6F)O?cvY4?ki-tpF(R
zJ0OCJmJ&@O-C;Ew)_4961F$v4t&BsIu~!jG-xMT#`~Yb4<yQm=fG>9$NC1XuO90g+
z0@(++!vSS9WT9CR?MCp=MG?vpEXLygQlQ3g>jgtTmBS4{X|JMiM4?f?4govRzkrVi
z;2h)!aA`>4NhBXYQm`2Sq}l;g1py8D7obEu`Y#q+lj8F70XpAN0Q?8cX%HpEW}lx+
zyM2=Y-T8)sedw?N034S9+<X$eo4-4e3{688N#_myN2BBk0>3LuQbA^=&(hN7yl~<-
z&!tlz`4&L9E1RMafv5tSYotFH`?I$wgKkRe<o62;#Te)*#TV>-B$#Fc61mKd<;|P+
zan+g@6!|~je{*7fs?R)qdXI@E-w2Mx7=n4~Q5hTgM4_^PEDHBxRF*6<Sh!OY5t#5^
zgC)fd^*?$29=}5<46gq4n!^?Z+=xM+B^4#=#EgUgZ>QrAA3prYHu+!6e}5nWf7qLN
zJ9)S>nwgkcTbP*}o72pi8yh>Pz+%KAks1$8^pnDv<G8Z0Fj$%yf7k(<&_S{wkg^=y
z2fU9=546A+FaodtdKZX5tC^Fd`#;-dF9-W`Z3m|fF0{8^BT?(s28ble5&Cqms0gr4
zI0UUS18qY+heuOXGMSvJ|4IEe5hcB=X_xIn0wN^;zM!YTmY^qv+ugGieH-LaSyf%i
z6^+tI^#QCVU4805B#sL)`+wIwwaOXF0&Pqrz(ojEEE@ez;p=GyT=S=;UzQe~nO|FW
z@n1M1s~VNhTgv@zIqH@s9~v}5mdHEmiHtGB=`g=2Wz0m>6MpwQAGo?xwiqx~e*RsC
zSKWO@$A~Otphvuq$;>6INm7?$@!?Ch#p#_-OMYyup84Ly!~}yZe}rU2bE_J<MkEr}
ztf>$|!tfeO&8N$vH}tkYsv4)f9p8(71qn}78!^JNo3`>`;5Y6&vT&1m3HPL!dihXG
z8fo1$2qdS(oG~KojcjyDGw}$zGY(vY$@191IW>#^y^CYbt0|quvUdL~FcUDA?Sk4P
z1aHKT*MGOOOQG*f`7M&bkH$KZz$#M4M3Un?QYq+C8f&^)YBR{sW%0Jp>CeRw21fw&
z#7u~q&SQVg$S9BOz+7JMIHC5Q7;dJk*N;K_JkMUn5Y3T^yi)$-0qh}Bns4l54Y!S#
z^J$@Xf5!}|g%u(vs6!(iuH5L*7ysl?V-I^vW!A+ektHZ>F@AHa<nRc~>2Iz<Cbeha
z`Ak+<yzV|DR&Y1&8#Z=-_FHGw?igdS&dgnp&w4mh{VN3;PITi!{{7qI&aGu8FCB_n
zsuH7+4c5T(XP&``hyb?aGIxPph}pWuE}UHI=AT4`CnQ3rRI=TOrIfgdIHais2An<J
zIhIqIFTIM6ME!#GFFYozZJwlzOZO`24T6Xi^0>;s{2NmqT5pBM6zg57uO6a4oByrU
zB-TEYc8q&Jr)|g*JPBma*82K^KBV8WZ&y(&Js`+!%2D_a!7gma^57v%-A^9!m=64|
z1KFw02j|5esMSwQj((t543e)5k9?5G*QESX7hm#MAiU8^WlHkm@2=ctwmtV8!OIF0
zL`FQ08T=56vt@iJ^HQh8O6kE}WNUck^YV<#Tpgs}o9on+8f6+!_PwWv^!Gn2%`>J7
zeV>K>`bO;e_ABdVe<Xv4@;W9L)u_RJMl+T_aaW?@%@(cqrbgqWYx#pF$G{I#$>Moa
zsfzEb`&ElUe2L{{F4rkV@f&Jd%HdFfKX6*yr+0cf*szJi%d!wC8QZYXepTonv$y@d
zavM0t%B|L&h-Sk7I7_n5>l4V^&H1;S5UXbn(yr)t+)?$#DRalNR}aaNV9Yp=fXKHx
zBiDl>Y}qN?MEr>`qzx$Bbu8<je`KB+ey+_m*}%A|*>^$AMGsZzo`1S4mq?y_a)Wz;
zf)(n(XIVl2^~)@ddAUxgK#40I;RL+9vA76fBoXMXrxM*@Slsbxep_})h(jTR>x#?_
zwaf6Djb7b}nbUPaK*-E6UV4g)?sa_Nkh3e=n~6w~gZ2-UY0vN)SFl8?OBatTjvN`X
z9^&&*U>pH6SG`oqSm*52N1e2U>z9?EUW|x7q6$*DdnnD&o!VpvGtwCu=pS+4LQ5Hq
z#lJfG#o1e29q=3Q^~c=v(~6ygj5=16UB4O6&pf<%yi9L*``;bT2w%snaFfTF*lG~;
z^(=B38tmm7&7Z<udh4B)^JE`FB$a<-@BZ{|Hfo6~cY^okx~y&5m2(*R6Mv-PKIlRX
ziGHRM+cIiSPxE{D++AEmpqdpDKP--pMR(avq9SF$uvcSon=*^fw_<{wZvk6{SaJ0Y
zjXPQ!C@ytnNe4?e`eyY74hmDy2%a3GJMzX$Fe2~UKR4NYZa~aZjQ#ngieIv|J%@uV
z=bv=VlpErVLm|aocz%3TC(eVL#CKHFJ%I^>O_eAbVZ;p&sukoS=BT?e39EzG87;1Z
ztbtPVjX%T-9p+%!ml(p+x;C5Yi+cV8C8cNUo?sF%EPUxg$J=(1z*$b97UocG+yD`w
z(A+t)B<sQ`zegBUnz3(xE2|65zLOfTnQmhmxJ9PsI7-2#WIX>VVZ(V0;lzxH;c6^0
zBS!>Nrg$Azb~QS9sQ;_6n5o%9myF2NxX&kVV{G0*hM!+qX1B@c-sS#&wPNoI2=*{|
zki7lcjBX6IsLm<lO%4qg#EadUcH4lu$evlI$Hzs$fKP`+5m}jbFgSPEM#W3tA3|Qm
z6;1OaYSOD6ZaZBC{B?2EC*pRmlDDs!{GB@g74BceathH)@`eS0ta1LIBG$j4=w{*W
zZsTa>_Ag}h=x)2M^Pu_n^^xuUO-&5vV1XwhEmIJOf-22A&1t}${bVPYOt{n6mxjav
z*HH%hQ;n*voBlk(sn5XW*#$kOSxY&)q#JSk4^uFE;wLG6#f#u0ljj$z2krM$oDnl(
zF~$LwIMHl3<l$KiKdAyag9*cJn5tw>^X$`XbJpW*c)QF%{Q%9cUEdB<EtGJAC)NyD
zIH{`AWN#i{e!jf&tEZ@T>VnfZH}2-q4l<QcG}6HSH3;b3(PwaLmbpz6F)=l&_W{mr
z>-z)?`mlGcM9U-f+jUsx0n?p9tLumMcdL%)Or&Y8S|~ShOTm8IuYYs?wDcAQBD2CT
zJ590`aYG(ZR2prje~~0)YJ)P{6Td)Am~^k-sgW&nb<4eE?x$XO-C)w9Pdhc8hf~Y_
z`>FV2$a3l!{4pakxdenftVf9|P5GWE7xpx#?~f1Hr3qQHa52IOI<C_e(1?*=;#!6K
zH@Q>sZM`$cNQ%K=+ma5>wzz|d-MY!Ro@<TAa#ejt!)kraZLJvDC0~l2+p*oje1X=y
zMSsWmRV0Q?a{4s|4%od-=x#cy7dTS^3YCpHE=h}c$WjzNQ(Ik{d2L7PyQ)%dbSvtK
z-v(VRI@ZeP+h05No&TcxfFQ-7RP^RTAoaFyE*Zb=_ZUJfzrm;zqB2*kg{ZTN4?QaV
zwoM?NY+2j2`MX2!MNdRi`iT<1A|T;C0g;)yFU(vXi?})obK4Bly2+VKC3D=NR5%R-
zPD(SSU5#cDKCCI?*6kV&3mvj|m*y{M#P$J;+VW8jlc=aDi6S_Zo=b%x%iqj)Sqht-
zeXxRqI4I`tf*nzlN`@DERgUwC=o|IA4~Mp`&s;ghl?hM9K*nW(jg^6!f=B)8CdBGV
zn&1Sw$`M}4b<b5Nsvvzu0?f2h!D&b){G4gjMG!*OsPZ>`qv!F_ZQhax*2w4&e9#@a
zPC;nP?-g1LD+0gC9Ye^77%Kxh9+W#7wA1qsf_KP6NeV9)2HXQB{XwOaUh}hyakRz4
zh4^fxt_X86#bwou>G5q3A53d_f+|PEQ|OrSFRtK`C7aTmpuqf3(w=2Q0jT4Aqs2nr
z@MYRQXzwgZ`#7?`KND5dSa=t(NQgFM*wM=YyAUI;GpI(P9ARX$)FruNONfn(-ufyo
z-|m)*1?Ej<)-+m7g&1&eV5B_$v@dp%6>>UaApXEWH=3YKcM`-;I0D4_#Va9YxWqpt
zyNQ4`7$Xq{L#Y{(i}h)qq&6zeh528Xw+{_J`wK={4bVG5q$n_psiB6iPUJoo+`<=5
zANfVb1eEBw-PMIhQC5U7+CD{w@gQQjIkDme^Z0!<_rD%1p{=Z%3{IARDPP7BmeeC<
zA8r(nB{KPoZXcq~+uJpaKXT-&PVv)(9PMw79LT7D6YeV`sMFwPj<a<tjf;!5xz;;T
z=!bm>^q^#A+C|Y}oAa~E;n@+|;))C?l{32sfo#G;{97*XeX3IVk;IL1>3u(pcuvp2
z-?QXOdOgTiRI-)gm!gGD_Hp&{qA-`qFX3DfGxcqQYkg4i8rr^O%L;KlA}7kGk$t?8
zGS9KAII^}b{;C;urL$!nuiFfLR{H1PYJ%gIem_-J%ql~wQV0&97*QXrXelsd=@Rdv
zZ9rX|zdJhCRgc6{u3)ymHS8f0iy-%x@^Ah|Wt>IxC4;wtg-zise+(o%Vn-|#stzg@
zGs~`|S$%bB!S?=A**!nc0`(&muDI9cH*E^WfMHAyb>EANnG&7dcsaP;au3|ojeLTs
z>=1Uf70LtCoy0Fs&iRllF}a^!NB&U82rGom!|(SCUE`}BN_XP8^zIJwRMuG;8%I@r
zr_^xVF`A(5i%E2F(^f|IOdHg*q?Pwz?J`5urr<BZSRK0V7EhHgE^9;yoDX>M9mcIu
z+@U<^hLC>=*cYglIP@M3z)u<@t{l`tzk5^ol5{MSUuveW(KniJAe7oe)AIvxcuaH3
zXNk*YCik~=GQRj@X^ua4>c1NO3la{?3%#c>z!WpUyfXiFTJxU?XDr-J{soA*6uE>P
z7Ob$puh@~(I7o+cgOF0ci)-*&Rn@AxMjQX2%>>59;>`yb-7t)qt9%c4>pOMxb!Zxq
zGvNJGs8?iu5$?akN1C-Omfrb%dO5YxnJ`o#-_!j8Hk5vOi8M|tq$u7YjWJ8MbHnB{
zmV=}m1-OVZ9DONJUw1T}s${NIpYGGP>tB0$akSshTYt!nPB6lrUy0+EU=HjLvK6(+
zhwy?CU?XtC{3CI`$UO8F!G0n5Oxuc&{D9@t@<SA@<m79S+?2P66I6O!qJj+a-4@Jk
zfq~W5o8`_bWBLgSYqUKQc_~Y<Ch>wu-270pu@ypEN>SHAmCZ}jgwHZM0%2$r?kX;c
zvqW)f=;}5#tzrpF{E<f;Kil+Z-ty`fGvO#!#SpYVY%Ru6@2oojF%hEO#Ny;iF~M>u
zLHwFfQuqjoWPHWo47H|^@e)~Z0#h#-T98jDDkc2S9*@eI^nK&V(<OzuC-2)<*$BrM
zuF=N1-`JU=E?A4-f2=5~Zz5V%1jHy(o&I!+n_9#Fo~y!rs~$9>POWgUPR~K4tT3U0
zWTlb^+pO2Jmgu#_!N}<_E%zx4v1i_Q?%v39PSH@!QiM4TYsBsIdh_|rfXIfjrGw)b
z#Q+l>o4W_pTu)!m1LD6kqqQs8eIEh@qKE$PXU2b@iYVr-WwwtP1p4>-PdaR4=I-HY
z;l|9$0zBAQ{<C0VWfT9m%EBTk&M7G-%EBWq@xPu@2!a6^f}DK-b^|g$ReJ*#&{m=f
zq99OX0^*AaaBhM~&16&+Kp-C~5GXJd1bPDA3OojZJXk=W-^L&iUnU5I>zw;dMF41k
zG?kN<0D-FG$k~83cxM?MHxLLB^WO^sl${IAc0^S8pBanRff<W(v6ea;3NB2zKDL=y
ztzw~lr|du^D;6E<pd5_E?<rPU{90cuwU_>J_G9}#)!b?C&kjl&l}+qHKPYvUi(rJ&
z-aixefBuf-3c1;yUIg)?jQtgQeHOi|YFEsw_W2E7FyQnPQNfb@Uq9da$kU|d(O<2X
z7m+o-u(Yw{{N7*d9HRTh##Go))h@pFeRVKJf9!WD@FrhS1g+z5u<{oX+Xt8ch3u^9
zM(60H>NE^Fh_4hglax4EoF30<L^z-G)ASf5*I@B)ZJa(r<$UXr#k_%VvXE0xhmG=p
zd|z7JDC1ytVhdLA9^^b$)!tatE92m$^!B@}@?$6q+IPc)#+JJZjV|*N9a8NsG^I6E
zZp31))Q-kgXBa}HOW%b7nuGt3H50k)8f7o}ng>|9Sov^zxDl$?2H04-Fr-=f2xxKq
zxAjoj>PdG6HEycF`~StUWhjNk=uFmF8ppn!iPqPWFHD({J2ek>Z-kM|rpz;3aZXw=
z{Q)If()>KZ!(%MU?z~@6g#n9!>C8Vu$=kTr;9Q2|iM6o9sYoT%UTrr9dFohiolgq6
zS4f83uk&@ef9kP@UA$)8z9a?_@uqHJ?W@et;apMC2euJP{Tc1u9uT<ssWpCa^2o5y
zSslcNQbIzBZ2Q=jXiAps{gbToQFA&&uq@7?T$^v4CX23>wXyX&>_zuUrnA(+H_1H_
z{aUz*qwRj`Ix{wzcz$5GJvHxu!&|Bv(j~^cu!X&TMAAHElgL`bj#r;JWeWb(OH@jZ
z#KxjzL6ynRyrr9lvr%p`{c2umysV!|h35Rgx$`s5LE{LUfQ4Rn#3XK#q-&6SyIyvB
zoon0V2S#=cgmb=n>?FD@ijXpW)$-aBLi&WT^hX(=%schbuVhV9{>*-PU<YdI(fv?H
z?5xAHua0k9gV_{aEA`9XX%l`)<(d-?^YmQ!qVcI(WNiMlM>3!7-Lqa)4|$UiOC$0;
z!+oi#Ki`b9QC{1vVXXy+xi+Ozwp69*e?k<$;&d&zRosmJv0pYQj&;Z?J<&H|*Q6xx
z_wyjD-_T{~DX%u8ah|J5{;M~~Y&h!Kec8V5qkgzt^C+9ce*A3Jda0>GGLzz-Y}w-4
z8JBClIvmQV!#o?-`7k+l(ajAzUalADRJ~UC7_qd1@jXdDxj`c7g|~RAQD-HHkQy=f
zLAP^zEF=p|<0{KHp5q;T*D=LD>SQ4^@YDr!A5FjP;o6t-7-Fk{9I4T_J(H}4p;R1T
zpP?PMI+8u$&A_#A&J$y1J?wk2uK`+irtNZWh|B*GR|`iv<qU8HKrvoH)Y>rpV*VrV
zbHjs9I~WV~kTfPAUV{=IR^vTiF+80;CM%DfuJ~rNUQePfQJT+ww#r^uQv7t-C!0RN
zvsyVD>FtNzGR`Mzc(vhk%lYYW)0xkCh(tL20fh>N;Q%Jz91k?nkuGh$-S6kkUt=xB
z96le6EZ^3{tlj?;DOS+Fxg$ZhkbOwKc@$642Bw{zrfvHPn&7j_cQiibA$nhnquRYM
z;YY_2j;P*NwRhL#1S`64wwU*(ywmCL`fckE&u5RFHNFI+5bdkIvW?xA69uWN)ER<w
zrxFt8aq=!q5)S)InXzG{KMo2Go7!cj-JZm3I_KJ2beY`Jj~V}tyQb*%rA(Br@@9~<
zgP(GGV$UdypzlWnxty>^5s|00Wg7KAZGVo7TpUGO+s;}L-HMsgE(^X*t=Y%aA#Fae
zv?1wenTnp$meEyATT`VaBXipy3Br+IjgMWjHdSyzc{%QvbP9K8IdC}e(9<mlo<Uk_
z5kpBqz@xRA`1n<3dE$dr$U9c#JBf5^V>vfER*mOQVSNgFo_9!WF<HT9&m&R=q*}9-
zSl4ts2b9p!wKjWoYx?C;m3fW$jAn~i`E}SvMR?zq2Z?+4Lj#9rc{QlK2qCtgI)|U6
z3(34WL~BJ4Z>!9b2u~&nuoq^Y@`tL^<Q&vxFHk1+n4j0Zwbl&S#@AXbiq>%^+M6hq
zuX|hEcD3LR8B+zzvN%%Go9c6!?8r^AM>~|^p3F|{kJ?f_6;6nznFM8*Bi3)L7cy*}
zP>p+vze);0Fr_(R3V9ylObEi9c1-d5{Z@k2s!i1=(KdA>eb@g;ubCu(raKceEuBFe
zWcT^UplvC$OwGfnqUU~pe>WRS<3fGIko;1B+O?3?4a;`Zbh>-I@6BEOi6_LF?X!W0
z`vFA$9&f%Co#!mueA_Z1$@(O*d-H;xJjv(G-x7q9I+f|KCsq|&mj>qaLWc}*<14iu
z_u};qZ$j40_o!)SCud2mUzoq$?w9sIW5hc@nO^M`-|t2$e->U}KZz^H?PlaqJ@Shu
z*MyL>*J_V{g5#@p$hd|kHe&~A2n?~iSKz|2MGD=P(Wrl={IhW|pJV{>)yiRGD;~om
zl{NOSLktx=r1m5*a3#2pTvQ$Gm2duId5x*sFGI}6-<N&l9dvPP%<{aDAcS5O%4;9F
zs3%pB86re>-FoPFHXdR5L?E<3I?5(~j8DfKn4HP^4XMnmvNRa#%%(Yf#q3_fpCegY
zFAt(JgN3c7hVFck+jrO>L^z!A5W!e)L44ztXR6zb+vNrg$Gfekbybz8$oY^WdowC3
z%kL36mO7DXH=#SnZ7F?z*!{fvA{@Hsy;@}_bmJXErrU@M#giP8%c<cC;UxWAF!D3&
zUrJp`b9xVnpZNTnp6{dZSzj}MHbsKMrv2+}o?;JFa}F4Eeju<f<q9_?;fmk1H^pXn
zMe*~5-tdm6cV#sBN>fhb{7EmH?5l!hNU>33<!;EY5KBs{HAYbDhzWUgif`o{G0^2Y
zTsz#<>tPiCe$?*N7WU_ns^vM=OzGl)?`dR9dUFsl*3vYD^69N=hsn{jeRXRQr`#D9
zbwixkGqde=_I#B?br?fBXgL?><jGQIVZ&SNds^-=64ebAK^DopH6HH5jQ*Y-l!v|W
z+!+P$jC%W|gAz5<0hZ7XrJ)u1jd+$BcE)^xU(iED#EoC!>Qv?KUFbww=S@k{psghT
zR|xxw`jgbZ$v;n~m9)qB%Gpy;A2Sc`XBl>MzEDd-7(Dhn{tkw11E;Si#%kQ7K$KRo
z=*?~!R&q5jrhaQ>aNY7ioB|gH?`e<ul;5DUKZKTjp-*Rv@{>ujRGx%ymp+S9C8E`F
z5bCj9U*}mQElRP*oH%z!&ui~Il)|v1{$iD%RcGo4H3%s)mw$gY`C0uMJK+lM##_ZJ
z>V~!?wCG+_j<Me5i}8sr6)Q>L>#^v{XbENWL%0DXC4u*ZB5o$LxKAV8c6QUjWTfwW
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

diff --git a/htdocs/includes/escpos/example/resources/document.pdf b/htdocs/includes/escpos/example/resources/document.pdf
deleted file mode 100644
index 93a702337f1b09cfcb96ddce75a0c6421b69251e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24389
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

diff --git a/htdocs/includes/escpos/example/resources/document.z b/htdocs/includes/escpos/example/resources/document.z
deleted file mode 100644
index cb0473875589c9505bfaa40eec9fb6bb930e59a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20320
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
RuDa7m%-5OL40^FJe*+_L<7)r_

diff --git a/htdocs/includes/escpos/example/resources/escpos-php-small.png b/htdocs/includes/escpos/example/resources/escpos-php-small.png
deleted file mode 100644
index 3c74d2d57a29e0398f706efd0e2f4531c036584a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1941
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
bG%zbMF*-0X?$PJj00000NkvXXu0mjfgfCmX

diff --git a/htdocs/includes/escpos/example/resources/escpos-php.png b/htdocs/includes/escpos/example/resources/escpos-php.png
deleted file mode 100644
index feee2d71cc280655b1765f2689bbed8299ba394e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7871
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

diff --git a/htdocs/includes/escpos/example/resources/tux.png b/htdocs/includes/escpos/example/resources/tux.png
deleted file mode 100644
index e32f8d945345480f7bdd85354b48bbd84dcb4f0e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5198
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
IM6N<$g1R`El>h($

diff --git a/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php b/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
deleted file mode 100644
index 72dc7c8f2ed..00000000000
--- a/htdocs/includes/escpos/example/specific/29-latvian-star-tup592.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php 
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-/* This example shows the printing of Latvian text on the Star TUP 592 printer */
-$profile = StarCapabilityProfile::getInstance();
-
-/* Option 1: Native character encoding */
-$connector = new FilePrintConnector("php://stdout");
-$printer = new Escpos($connector, $profile);
-$printer -> text("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus\n");
-$printer -> cut();
-$printer -> close();
-
-/* Option 2: Image-based output (formatting not available using this output) */
-$buffer = new ImagePrintBuffer();
-$connector = new FilePrintConnector("php://stdout");
-$printer = new Escpos($connector, $profile);
-$printer -> setPrintBuffer($buffer);
-$printer -> text("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus\n");
-$printer -> cut();
-$printer -> close();
-?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php b/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
deleted file mode 100644
index 49eca235091..00000000000
--- a/htdocs/includes/escpos/example/specific/32-german-tm-t20-ii-custom-command.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-/*
- * This example shows how tok send a custom command to the printer-
- * The use case here is an Epson TM-T20II and German text.
- * 
- * Background: Not all ESC/POS features are available in the driver, so sometimes
- * you might want to send a custom commnad. This is useful for testing
- * new features.
- * 
- * The Escpos::text() function removes non-printable characters as a precaution,
- * so that commands cannot be injected into user input. To send raw data to
- * the printer, you need to write bytes to the underlying PrintConnector.
- * 
- * If you get a new command working, please file an issue on GitHub with a code
- * snippet so that it can be incorporated into escpos-php.
- */
-
-/* Set up profile & connector */
-$connector = new FilePrintConnector("php://output");
-$profile = DefaultCapabilityProfile::getInstance(); // Works for Epson printers
-
-$printer = new Escpos($connector, $profile);
-$cmd = Escpos::ESC . "V" . chr(1); // Try out 90-degree rotation.
-$printer -> getPrintConnector() -> write($cmd);
-$printer -> text("Beispieltext in Deutsch\n");
-$printer -> cut();
-$printer -> close();
-
-/*
- * Hex-dump of output confirms that ESC V 1 being sent:
- *
- * 0000000 033   @ 033   V 001   B   e   i   s   p   i   e   l   t   e   x
- * 0000010   t       i   n       D   e   u   t   s   c   h  \n 035   V   A
- * 0000020 003
- */
\ No newline at end of file
diff --git a/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php b/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
deleted file mode 100644
index 7314ad21bf0..00000000000
--- a/htdocs/includes/escpos/example/specific/33-spanish-seypos-prp-300.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * Example of printing Spanish text on SEYPOS PRP-300 thermal line printer.
- * The characters in Spanish are available in code page 437, so no special
- * code pages are needed in this case (SimpleCapabilityProfile).
- *
- * Use the hardware switch to activate "Two-byte Character Code"
- */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-$connector = new FilePrintConnector("php://output");
-$profile = SimpleCapabilityProfile::getInstance();
-$printer = new Escpos($connector);
-$printer -> text("El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n");
-$printer -> cut();
-$printer -> close();
-
diff --git a/htdocs/includes/escpos/example/specific/39-currency-symbols.php b/htdocs/includes/escpos/example/specific/39-currency-symbols.php
deleted file mode 100644
index b3d4b29edd1..00000000000
--- a/htdocs/includes/escpos/example/specific/39-currency-symbols.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php 
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-$profile = DefaultCapabilityProfile::getInstance();
-// This is a quick demo of currency symbol issues in #39.
-
-/* Option 1: Native ESC/POS characters, depends on printer and is buggy. */
-$connector = new FilePrintConnector("php://stdout");
-$printer = new Escpos($connector, $profile);
-$printer -> text("€ 9,95\n");
-$printer -> text("£ 9.95\n");
-$printer -> text("$ 9.95\n");
-$printer -> text("¥ 9.95\n");
-$printer -> cut();
-$printer -> close();
-
-/* Option 2: Image-based output (formatting not available using this output). */
-$buffer = new ImagePrintBuffer();
-$connector = new FilePrintConnector("php://stdout");
-$printer = new Escpos($connector, $profile);
-$printer -> setPrintBuffer($buffer);
-$printer -> text("€ 9,95\n");
-$printer -> text("£ 9.95\n");
-$printer -> text("$ 9.95\n");
-$printer -> text("¥ 9.95\n");
-$printer -> cut();
-$printer -> close();
-
-/*
- Option 3: If the printer is configured to print in a specific code
- page, you can set up a CapabilityProfile which either references its
- iconv encoding name, or includes all of the available characters.
-
- Here, we make use of CP858 for its inclusion of currency symbols which
- are not available in CP437. CP858 has good printer support, but is not
- included in all iconv builds.
-*/
-class CustomCapabilityProfile extends SimpleCapabilityProfile {
-	function getCustomCodePages() {
-		/*
-		 * Example to print in a specific, user-defined character set
-		 * on a printer which has been configured to use i
-		 */
-		return array(
-		'CP858' => "ÇüéâäàåçêëèïîìÄÅ" .
-				"ÉæÆôöòûùÿÖÜø£Ø׃" .
-				"áíóúñѪº¿®¬½¼¡«»" .
-				"░▒▓│┤ÁÂÀ©╣║╗╝¢¥┐" .
-				"└┴┬├─┼ãÃ╚╔╩╦╠═╬¤" .
-				"ðÐÊËÈ€ÍÎÏ┘┌█▄¦Ì▀" .
-				"ÓßÔÒõÕµþÞÚÛÙýݯ´" .
-				" ±‗¾¶§÷¸°¨·¹³²■ ");
-	}
-	
-	function getSupportedCodePages() {
-		return array(
-				0 => 'custom:CP858');
-	}
-}
-
-$connector = new FilePrintConnector("php://stdout");
-$profile = CustomCapabilityProfile::getInstance();
-$printer = new Escpos($connector, $profile);
-$printer -> text("€ 9,95\n");
-$printer -> text("£ 9.95\n");
-$printer -> text("$ 9.95\n");
-$printer -> text("¥ 9.95\n");
-
-$printer -> cut();
-$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php b/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
deleted file mode 100644
index 4ef1a9575c2..00000000000
--- a/htdocs/includes/escpos/example/specific/44-pound-symbol-star-tsp650.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/* Example of printing the GBP pound symbol on a STAR TSP650
- * 
- * In this example, it's shown how to check that your PHP files are actually being
- * saved in unicode. Sections B) and C) are identical in UTF-8, but different
- * if you are saving to a retro format like Windows-1252.
- */
-
-// Adjust these to your environment
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-$connector = new FilePrintConnector("php://stdout");
-
-// Start printer
-$profile = SimpleCapabilityProfile::getInstance();
-$printer = new Escpos($connector, $profile);
-
-// A) Raw pound symbol
-// This is the most likely thing to work, and bypasses all the fancy stuff.
-$printer -> textRaw("\x9C"); // based on position in CP437
-$printer -> text(" 1.95\n");
-
-// B) Manually encoded UTF8 pound symbol. Tests that the driver correctly
-//		encodes this as CP437.
-$printer -> text(base64_decode("wqM=") . " 2.95\n");
-
-// C) Pasted in file. Tests that your files are being saved as UTF-8, which
-// 		escpos-php is able to convert automatically to a mix of code pages.
-$printer -> text("£ 3.95\n");
-
-$printer -> cut();
-$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/50-P-822D-greek.php b/htdocs/includes/escpos/example/specific/50-P-822D-greek.php
deleted file mode 100644
index 2d88cf1a2a8..00000000000
--- a/htdocs/includes/escpos/example/specific/50-P-822D-greek.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/* Example of Greek text on the P-822D */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-
-// Setup the printer
-$connector = new FilePrintConnector("php://stdout");
-$profile = P822DCapabilityProfile::getInstance();
-$printer = new Escpos($connector, $profile);
-
-// Print a Greek pangram
-$text = "Ξεσκεπάζω την ψυχοφθόρα βδελυγμία";
-$printer -> text($text . "\n");
-$printer -> cut();
-
-// Close the connection
-$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php b/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
deleted file mode 100644
index c2b0fb5aa57..00000000000
--- a/htdocs/includes/escpos/example/specific/6-arabic-epos-tep-220m.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- * This example shows Arabic image-based output on the EPOS TEP 220m.
- *
- * Because escpos-php is not yet able to render Arabic correctly
- * on thermal line printers, small images are generated and sent
- * instead. This is a bit slower, and only limited formatting
- * is currently available in this mode.
- * 
- * Requirements are:
- *  - imagick extension (For the ImagePrintBuffer, which does not
- *      support gd at the time of writing)
- *  - Ar-PHP library, available from sourceforge, for the first
- *      part of this example. Drop it in the folder listed below:
- */
-require_once(dirname(__FILE__) . "/../../Escpos.php");
-require_once(dirname(__FILE__) . "/../../vendor/I18N/Arabic.php");
-
-/*
- * First, convert the text into LTR byte order with joined letters,
- * Using the Ar-PHP library.
- * 
- * The Ar-PHP library uses the default internal encoding, and can print
- * a lot of errors depending on the input, so be prepared to debug
- * the next four lines.
- * 
- * Note that this output shows that numerals are converted to placeholder
- * characters, indicating that western numerals (123) have to be used instead.
- */
-mb_internal_encoding("UTF-8");
-$Arabic = new I18N_Arabic('Glyphs');
-$text = "صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ";
-$text = $Arabic -> utf8Glyphs($text);
-
-/*
- * Set up and use the printer
- */
-$buffer = new ImagePrintBuffer();
-$profile = EposTepCapabilityProfile::getInstance();
-$connector = new FilePrintConnector("php://output");
-		// = WindowsPrintConnector("LPT2");
-		// Windows LPT2 was used in the bug tracker
-
-$printer = new Escpos($connector, $profile);
-$printer -> setPrintBuffer($buffer);
-$printer -> text($text . "\n");
-$printer -> close();
diff --git a/htdocs/includes/escpos/example/specific/README.md b/htdocs/includes/escpos/example/specific/README.md
deleted file mode 100644
index 7433e7aa247..00000000000
--- a/htdocs/includes/escpos/example/specific/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Specific examples
------------------
-
-These examples are designed for specific combinations of language,
-printer and interface.
-
-They are documented here because the general examples all set up the printer in a similar way.
diff --git a/htdocs/includes/escpos/example/text-size.php b/htdocs/includes/escpos/example/text-size.php
deleted file mode 100644
index 2f9272e434b..00000000000
--- a/htdocs/includes/escpos/example/text-size.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * This print-out shows how large the available font sizes are. It is included
- * separately due to the amount of text it prints.
- *
- * @author Michael Billington <michael.billington@gmail.com>
- */
-require_once(dirname(__FILE__) . "/../Escpos.php");
-$printer = new Escpos();
-
-/* Initialize */
-$printer -> initialize();
-
-/* Text of various (in-proportion) sizes */
-title($printer, "Change height & width\n");
-for($i = 1; $i <= 8; $i++) {
-	$printer -> setTextSize($i, $i);
-	$printer -> text($i);
-}
-$printer -> text("\n");
-
-/* Width changing only */
-title($printer, "Change width only (height=4):\n");
-for($i = 1; $i <= 8; $i++) {
-	$printer -> setTextSize($i, 4);
-	$printer -> text($i);
-}
-$printer -> text("\n");
-
-/* Height changing only */
-title($printer, "Change height only (width=4):\n");
-for($i = 1; $i <= 8; $i++) {
-	$printer -> setTextSize(4, $i);
-	$printer -> text($i);
-}
-$printer -> text("\n");
-
-/* Very narrow text */
-title($printer, "Very narrow text:\n");
-$printer -> setTextSize(1, 8);
-$printer -> text("The quick brown fox jumps over the lazy dog.\n");
-
-/* Very flat text */
-title($printer, "Very wide text:\n");
-$printer -> setTextSize(4, 1);
-$printer -> text("Hello world!\n");
-
-/* Very large text */
-title($printer, "Largest possible text:\n");
-$printer -> setTextSize(8,8);
-$printer -> text("Hello\nworld!\n");
-
-$printer -> cut();
-$printer -> close();
-
-function title(Escpos $printer, $text) {
-	$printer -> selectPrintMode(Escpos::MODE_EMPHASIZED);
-	$printer -> text("\n" . $text);
-	$printer -> selectPrintMode(); // Reset
-}
-
-?>
diff --git a/htdocs/includes/escpos/src/AbstractCapabilityProfile.php b/htdocs/includes/escpos/src/AbstractCapabilityProfile.php
deleted file mode 100644
index db2e8e01f58..00000000000
--- a/htdocs/includes/escpos/src/AbstractCapabilityProfile.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Not all printers support the same subset of available Esc/POS commands. Profiles allow you to specify
- * which features are available on your printer, so that Escpos is less likely to send unsupported commands.
- */
-abstract class AbstractCapabilityProfile {
-	/**
-	 * Sub-classes must be retrieved via getInstance(), so that validation
-	 * can be attached to guarantee that dud profiles are not used on an Escpos object.
-	 */
-	protected final function __construct() {
-		// This space intentionally left blank.
-	}
-
-	/**
-	 * If getSupportedCodePages contains custom code pages, their character maps must be provided here.
-	 */
-	abstract function getCustomCodePages();
-
-	/**
-	 * Return a map of code page numbers to names for this printer. Names
-	 * should match iconv code page names where possible (non-matching names will not be used).
-	 */
-	abstract function getSupportedCodePages();
-
-	/**
-	 * True to support barcode "function b", false to use only function A.
-	 */
-	abstract function getSupportsBarcodeB();
-
-	/**
-	 * True for bitImage support, false for no bitImage support.
-	 */
-	abstract function getSupportsBitImage();
-
-	/**
-	 * True for graphics support, false for no graphics support.
-	 */
-	abstract function getSupportsGraphics();
-
-	/**
-	 * True for 'STAR original' commands, false for standard ESC/POS only.
-	 */
-	abstract function getSupportsStarCommands();
-
-	/**
-	 * True if the printer renders its own QR codes, false to send an image.
-	 */
-	abstract function getSupportsQrCode();
-
-	/**
-	 * @return AbstractCapabilityProfile Instance of sub-class.
-	 */
-	public static final function getInstance() {
-		static $profile = null;
-		if ($profile === null) {
-			$profile = new static();
-		}
-		return $profile;
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/CodePage.php b/htdocs/includes/escpos/src/CodePage.php
deleted file mode 100644
index 15dcee657fc..00000000000
--- a/htdocs/includes/escpos/src/CodePage.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-abstract class CodePage {
-	/** Code page constants, exported from iconv -l. Can be cut down*/
-	const CP037 = "CP037";
-	const CP038 = "CP038";
-	const CP273 = "CP273";
-	const CP274 = "CP274";
-	const CP275 = "CP275";
-	const CP278 = "CP278";
-	const CP280 = "CP280";
-	const CP281 = "CP281";
-	const CP282 = "CP282";
-	const CP284 = "CP284";
-	const CP285 = "CP285";
-	const CP290 = "CP290";
-	const CP297 = "CP297";
-	const CP367 = "CP367";
-	const CP420 = "CP420";
-	const CP423 = "CP423";
-	const CP424 = "CP424";
-	const CP437 = "CP437";
-	const CP500 = "CP500";
-	const CP737 = "CP737";
-	const CP770 = "CP770";
-	const CP771 = "CP771";
-	const CP772 = "CP772";
-	const CP773 = "CP773";
-	const CP774 = "CP774";
-	const CP775 = "CP775";
-	const CP803 = "CP803";
-	const CP813 = "CP813";
-	const CP819 = "CP819";
-	const CP850 = "CP850";
-	const CP851 = "CP851";
-	const CP852 = "CP852";
-	const CP855 = "CP855";
-	const CP856 = "CP856";
-	const CP857 = "CP857";
-	const CP860 = "CP860";
-	const CP861 = "CP861";
-	const CP862 = "CP862";
-	const CP863 = "CP863";
-	const CP864 = "CP864";
-	const CP865 = "CP865";
-	const CP866 = "CP866";
-	const CP866NAV = "CP866NAV";
-	const CP868 = "CP868";
-	const CP869 = "CP869";
-	const CP870 = "CP870";
-	const CP871 = "CP871";
-	const CP874 = "CP874";
-	const CP875 = "CP875";
-	const CP880 = "CP880";
-	const CP891 = "CP891";
-	const CP901 = "CP901";
-	const CP902 = "CP902";
-	const CP903 = "CP903";
-	const CP904 = "CP904";
-	const CP905 = "CP905";
-	const CP912 = "CP912";
-	const CP915 = "CP915";
-	const CP916 = "CP916";
-	const CP918 = "CP918";
-	const CP920 = "CP920";
-	const CP921 = "CP921";
-	const CP922 = "CP922";
-	const CP930 = "CP930";
-	const CP932 = "CP932";//
-	const CP933 = "CP933";
-	const CP935 = "CP935";
-	const CP936 = "CP936";
-	const CP937 = "CP937";
-	const CP939 = "CP939";
-	const CP949 = "CP949";
-	const CP950 = "CP950";
-	const CP1004 = "CP1004";
-	const CP1008 = "CP1008";
-	const CP1025 = "CP1025";
-	const CP1026 = "CP1026";
-	const CP1046 = "CP1046";
-	const CP1047 = "CP1047";
-	const CP1070 = "CP1070";
-	const CP1079 = "CP1079";
-	const CP1081 = "CP1081";
-	const CP1084 = "CP1084";
-	const CP1089 = "CP1089";
-	const CP1097 = "CP1097";
-	const CP1112 = "CP1112";
-	const CP1122 = "CP1122";
-	const CP1123 = "CP1123";
-	const CP1124 = "CP1124";
-	const CP1125 = "CP1125";
-	const CP1129 = "CP1129";
-	const CP1130 = "CP1130";
-	const CP1132 = "CP1132";
-	const CP1133 = "CP1133";
-	const CP1137 = "CP1137";
-	const CP1140 = "CP1140";
-	const CP1141 = "CP1141";
-	const CP1142 = "CP1142";
-	const CP1143 = "CP1143";
-	const CP1144 = "CP1144";
-	const CP1145 = "CP1145";
-	const CP1146 = "CP1146";
-	const CP1147 = "CP1147";
-	const CP1148 = "CP1148";
-	const CP1149 = "CP1149";
-	const CP1153 = "CP1153";
-	const CP1154 = "CP1154";
-	const CP1155 = "CP1155";
-	const CP1156 = "CP1156";
-	const CP1157 = "CP1157";
-	const CP1158 = "CP1158";
-	const CP1160 = "CP1160";
-	const CP1161 = "CP1161";
-	const CP1162 = "CP1162";
-	const CP1163 = "CP1163";
-	const CP1164 = "CP1164";
-	const CP1166 = "CP1166";
-	const CP1167 = "CP1167";
-	const CP1250 = "CP1250";
-	const CP1251 = "CP1251";
-	const CP1252 = "CP1252";
-	const CP1253 = "CP1253";
-	const CP1254 = "CP1254";
-	const CP1255 = "CP1255";
-	const CP1256 = "CP1256";
-	const CP1257 = "CP1257";
-	const CP1258 = "CP1258";
-	const CP1282 = "CP1282";
-	const CP1361 = "CP1361";
-	const CP1364 = "CP1364";
-	const CP1371 = "CP1371";
-	const CP1388 = "CP1388";
-	const CP1390 = "CP1390";
-	const CP1399 = "CP1399";
-	const CP4517 = "CP4517";
-	const CP4899 = "CP4899";
-	const CP4909 = "CP4909";
-	const CP4971 = "CP4971";
-	const CP5347 = "CP5347";
-	const CP9030 = "CP9030";
-	const CP9066 = "CP9066";
-	const CP9448 = "CP9448";
-	const CP10007 = "CP10007";
-	const CP12712 = "CP12712";
-	const CP16804 = "CP16804";
-	const ISO8859_7 = "ISO_8859-7";
-	const ISO8859_2 = "ISO_8859-2";
-	const ISO8859_15 = "ISO_8859-15";
-	const RK1048 = "RK1048";
-	// Code pages which are not built in
-	// to default iconv on Debian.
-	const CP720 = false;
-	const CP853 = false;
-	const CP858 = false;
-	const CP928 = false;
-	const CP1098 = false;
-	const CP747 = false;
-	
-	/*
-	 * Below code pages appear to be vendor-specific (Star), so iconv wont use them
-	 * They are being merged gradually into the StarCapabilityProfile.
-	 */
-	const CP3840 = false;
-	const CP3841 = false;
-	const CP3843 = false;
-	const CP3844 = false;
-	const CP3845 = false;
-	const CP3847 = false;
-	const CP3846 = false;
-	const CP3848 = false;
-	const CP1001 = false;
-	const CP2001 = false;	
-	const CP3001 = false;
-	const CP3002 = false;
-	const CP3011 = false;
-	const CP3012 = false;
-	const CP3021 = false;
-	const CP3041 = false;
-}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/DefaultCapabilityProfile.php b/htdocs/includes/escpos/src/DefaultCapabilityProfile.php
deleted file mode 100644
index 4275d03bde8..00000000000
--- a/htdocs/includes/escpos/src/DefaultCapabilityProfile.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * This capability profile matches many recent Epson-branded thermal receipt printers.
- * 
- * For non-Epson printers, try the SimpleCapabilityProfile.
- */
-class DefaultCapabilityProfile extends AbstractCapabilityProfile {
-	function getCustomCodePages() {
-		return array();
-	}
-
-	function getSupportedCodePages() {
-		/* Character code tables which the printer understands, mapping to known encoding standards we may be able to encode to.
-		 * 
-		 * See CodePage.php for the mapping of these standards to encoding names for use in the backing library.
-		 * 
-		 * Any entry with 'false' means I haven't compared the print-out of the code page to a table.
-		 */
-		return array(
-			0 => CodePage::CP437,
-			1 => CodePage::CP932,
-			2 => CodePage::CP850,
-			3 => CodePage::CP860,
-			4 => CodePage::CP863,
-			5 => CodePage::CP865,
-			6 => false, // Hiragana
-			7 => false, // One-pass printing Kanji characters
-			8 => false, // Page 8 [One-pass printing Kanji characters]
-			11 => CodePage::CP851,
-			12 => CodePage::CP853,
-			13 => CodePage::CP857,
-			14 => CodePage::CP737,
-			15 => CodePage::ISO8859_7,
-			16 => CodePage::CP1252,
-			17 => CodePage::CP866,
-			18 => CodePage::CP852,
-			19 => CodePage::CP858,
-			20 => false, // Thai Character Code 42
-			21 => CodePage::CP874, // Thai Character Code 11
-			22 => false, // Thai Character Code 13
-			23 => false, // Thai Character Code 14
-			24 => false, // Thai Character Code 16
-			25 => false, // Thai Character Code 17
-			26 => false, // Thai Character Code 18
-			30 => false, // TCVN-3: Vietnamese
-			31 => false, // TCVN-3: Vietnamese
-			32 => CodePage::CP720,
-			33 => CodePage::CP775,
-			34 => CodePage::CP855,
-			35 => CodePage::CP861,
-			36 => CodePage::CP862,
-			37 => CodePage::CP864,
-			38 => CodePage::CP869,
-			39 => CodePage::ISO8859_2,
-			40 => CodePage::ISO8859_15,
-			41 => CodePage::CP1098, // PC1098: Farsi
-			42 => CodePage::CP774,
-			43 => CodePage::CP772,
-			44 => CodePage::CP1125,
-			45 => CodePage::CP1250,
-			46 => CodePage::CP1251,
-			47 => CodePage::CP1253,
-			48 => CodePage::CP1254,
-			49 => CodePage::CP1255,
-			50 => CodePage::CP1256,
-			51 => CodePage::CP1257,
-			52 => CodePage::CP1258,
-			53 => CodePage::RK1048,
-			66 => false, // Devanagari
-			67 => false, // Bengali
-			68 => false, // Tamil
-			69 => false, // Telugu
-			70 => false, // Assamese
-			71 => false, // Oriya
-			72 => false, // Kannada
-			73 => false, // Malayalam
-			74 => false, // Gujarati
-			75 => false, // Punjabi
-			82 => false, // Marathi
-			254 => false,
-			255 => false);
-	}
-
-	function getSupportsBarcodeB() {
-		return true;
-	}
-	
-	function getSupportsBitImage() {
-		return true;
-	}
-
-	function getSupportsGraphics() {
-		return true;
-	}
-
-	function getSupportsStarCommands() {
-		return false;
-	}
-
-	function getSupportsQrCode() {
-		return true;
-	}
-}
diff --git a/htdocs/includes/escpos/src/DummyPrintConnector.php b/htdocs/includes/escpos/src/DummyPrintConnector.php
deleted file mode 100644
index e1a197b7c7b..00000000000
--- a/htdocs/includes/escpos/src/DummyPrintConnector.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- * 
- * Print connector that writes to nowhere, but allows the user to retrieve the
- * buffered data. Used for testing.
- */
-final class DummyPrintConnector implements PrintConnector {
-	/**
-	 * @var array Buffer of accumilated data.
-	 */
-	private $buffer;
-
-	/**
-	 * @var string data which the printer will provide on next read
-	 */
-	private $readData;
-
-	/**
-	 * Create new print connector
-	 */
-	public function __construct() {
-		$this -> buffer = array();
-	}
-
-	public function __destruct() {
-		if($this -> buffer !== null) {
-			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
-		}
-	}
-
-	public function finalize() {
-		$this -> buffer = null;
-	}
-
-	/**
-	 * @return string Get the accumulated data that has been sent to this buffer.
-	 */
-	public function getData() {
-		return implode($this -> buffer);
-	}
-
-	/* (non-PHPdoc)
-	 * @see PrintConnector::read()
-	 */
-	public function read($len) {
-		return $len >= strlen($this -> readData) ? $this -> readData : substr($this -> readData, 0, $len);
-	}
-
-	public function write($data) {
-		$this -> buffer[] = $data;
-	}
-}
diff --git a/htdocs/includes/escpos/src/EposTepCapabilityProfile.php b/htdocs/includes/escpos/src/EposTepCapabilityProfile.php
deleted file mode 100644
index 2803fe3f69c..00000000000
--- a/htdocs/includes/escpos/src/EposTepCapabilityProfile.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-class EposTepCapabilityProfile extends DefaultCapabilityProfile {
-	// TODO override list of code pages
-}
diff --git a/htdocs/includes/escpos/src/EscposImage.php b/htdocs/includes/escpos/src/EscposImage.php
deleted file mode 100644
index 76fb614715c..00000000000
--- a/htdocs/includes/escpos/src/EscposImage.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- * 
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- * 
- * 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.
- * 
- * This class deals with images in raster formats, and converts them into formats
- * which are suitable for use on thermal receipt printers. Currently, only PNG
- * images (in) and ESC/POS raster format (out) are implemeted.
- * 
- * Input formats:
- *  - Currently, only PNG is supported.
- *  - Other easily read raster formats (jpg, gif) will be added at a later date, as this is not complex.
- *  - The BMP format can be directly read by some commands, but this has not yet been implemented.
- *  
- * Output formats:
- *  - Currently, only ESC/POS raster format is supported
- *  - ESC/POS 'column format' support is partially implemented, but is not yet used by Escpos.php library.
- *  - Output as multiple rows of column format image is not yet in the works.
- *  
- * Libraries:
- *  - Currently, php-gd is used to read the input. Support for imagemagick where gd is not installed is
- *    also not complex to add, and is a likely future feature.
- *  - Support for native use of the BMP format is a goal, for maximum compatibility with target environments. 
- */
-class EscposImage {
-	/**
-	 * @var string The image's bitmap data (if it is a Windows BMP).
-	 */
-	protected $imgBmpData;
-	
-	/**
-	 * @var string image data in rows: 1 for black, 0 for white.
-	 */
-	protected $imgData;
-	
-	/**
-	 * @var string cached raster format data to avoid re-computation
-	 */
-	protected $imgRasterData;
-	
-	/**
-	 * @var int height of the image
-	 */
-	protected $imgHeight;
-
-	/**
-	 * @var int width of the image
-	 */
-	protected $imgWidth;
-	
-	/**
-	 * Load up an image from a filename
-	 * 
-	 * @param string $imgPath The path to the image to load, or null to skip
-	 * 			loading the image (some other functions are available for
-	 * 			populating the data). Supported graphics types depend on your PHP configuration.
-	 */
-	public function __construct($imgPath = null) {
-		/* Can't use bitmaps yet */
-		$this -> imgBmpData = null;
-		$this -> imgRasterData = null;
-		if($imgPath === null) {
-			// Blank image
-			$this -> imgHeight = 0;
-			$this -> imgWidth = 0;
-			$this -> imgData = "";
-			return;
-		}
-
-		/* Load up using GD */
-		if(!file_exists($imgPath)) {
-			throw new Exception("File '$imgPath' does not exist.");
-		}
-		$ext = pathinfo($imgPath, PATHINFO_EXTENSION);
-		if($ext == "bmp") {
-			// The plan is to implement BMP handling directly in
-			// PHP, as some printers understand this format themselves.
-			// TODO implement PHP bitmap handling
-			throw new Exception("Native bitmaps not yet supported. Please convert the file to a supported raster format.");
-		}
-		if($this -> isGdSupported()) {
-			// Prefer to use gd. It is installed by default, so
-			// most systems will have it, giving a consistent UX.
-			switch($ext) {
-				case "png":
-					$im = @imagecreatefrompng($imgPath);
-					$this -> readImageFromGdResource($im);
-					return;
-				case "jpg":
-					$im = @imagecreatefromjpeg($imgPath);
-					$this -> readImageFromGdResource($im);
-					return;
-				case "gif":
-					$im = @imagecreatefromgif($imgPath);
-					$this -> readImageFromGdResource($im);
-					return;
-			}
-		}
-		if($this -> isImagickSupported()) {
-			$im = new Imagick();
-			try {
-				// Throws an ImagickException if the format is not supported or file is not found
-				$im -> readImage($imgPath);
-			} catch(ImagickException $e) {
-				// Wrap in normal exception, so that classes which call this do not themselves require imagick as a dependency.
-				throw new Exception($e);
-			}
-			/* Flatten by doing a composite over white, in case of transparency */
-			$flat = new Imagick();
-			$flat -> newImage($im -> getimagewidth(), $im -> getimageheight(), "white");
-			$flat -> compositeimage($im, Imagick::COMPOSITE_OVER, 0, 0);
-			$this -> readImageFromImagick($flat);
-			return;
-		}
-		throw new Exception("Images are not supported on your PHP. Please install either the gd or imagick extension.");
-	}
-
-	/**
-	 * @return int height of the image in pixels
-	 */
-	public function getHeight() {
-		return $this -> imgHeight;
-	}
-	
-	/**
-	 * @return int Number of bytes to represent a row of this image
-	 */
-	public function getHeightBytes() {
-		return (int)(($this -> imgHeight + 7) / 8);
-	}
-	
-	/**
-	 * @return int Width of the image
-	 */
-	public function getWidth() {
-		return $this -> imgWidth;
-	}
-	
-	/**
-	 * @return int Number of bytes to represent a row of this image
-	 */
-	public function getWidthBytes() {
-		return (int)(($this -> imgWidth + 7) / 8);
-	}
-	
-	/**
-	 * @return string binary data of the original file, for function which accept bitmaps.
-	 */
-	public function getWindowsBMPData() {
-		return $this -> imgBmpData;
-	}
-	
-	/**
-	 * @return boolean True if the image was a windows bitmap, false otherwise
-	 */
-	public function isWindowsBMP() {
-		return $this -> imgBmpData != null;
-	}
-
-	/**
-	 * Load actual image pixels from GD resource.
-	 *
-	 * @param resouce $im GD resource to use
-	 * @throws Exception Where the image can't be read.
-	 */
-	public function readImageFromGdResource($im) {
-		if(!is_resource($im)) {
-			throw new Exception("Failed to load image.");
-		} else if(!$this -> isGdSupported()) {
-			throw new Exception(__FUNCTION__ . " requires 'gd' extension.");
-		}
-		/* Make a string of 1's and 0's */
-		$this -> imgHeight = imagesy($im);
-		$this -> imgWidth = imagesx($im);
-		$this -> imgData = str_repeat("\0", $this -> imgHeight * $this -> imgWidth);
-		for($y = 0; $y < $this -> imgHeight; $y++) {
-			for($x = 0; $x < $this -> imgWidth; $x++) {
-				/* Faster to average channels, blend alpha and negate the image here than via filters (tested!) */
-				$cols = imagecolorsforindex($im, imagecolorat($im, $x, $y));
-				$greyness = (int)(($cols['red'] + $cols['green'] + $cols['blue']) / 3) >> 7; // 1 for white, 0 for black
-				$black = (1 - $greyness) >> ($cols['alpha'] >> 6); // 1 for black, 0 for white, taking into account transparency
-				$this -> imgData[$y * $this -> imgWidth + $x] = $black;
-			}
-		}
-	}
-
-	/**
-	 * Load actual image pixels from Imagick object
-	 * 
-	 * @param Imagick $im Image to load from
-	 */
-	public function readImageFromImagick(Imagick $im) {
-		/* Threshold */
-		$im -> setImageType(Imagick::IMGTYPE_TRUECOLOR); // Remove transparency (good for PDF's)
-		$max = $im->getQuantumRange();
-		$max = $max["quantumRangeLong"];
-		$im -> thresholdImage(0.5 * $max);
-		/* Make a string of 1's and 0's */
-		$geometry = $im -> getimagegeometry();
-		$this -> imgHeight = $im -> getimageheight();
-		$this -> imgWidth = $im -> getimagewidth();
-		$this -> imgData = str_repeat("\0", $this -> imgHeight * $this -> imgWidth);
-
-		for($y = 0; $y < $this -> imgHeight; $y++) {
-			for($x = 0; $x < $this -> imgWidth; $x++) {
-				/* Faster to average channels, blend alpha and negate the image here than via filters (tested!) */
-				$cols = $im -> getImagePixelColor($x, $y);
-				$cols = $cols -> getcolor();
-				$greyness = (int)(($cols['r'] + $cols['g'] + $cols['b']) / 3) >> 7;  // 1 for white, 0 for black
-				$this -> imgData[$y * $this -> imgWidth + $x] = (1 - $greyness); // 1 for black, 0 for white
-			}
-		}
-
-	}
-	
-	/**
-	 * Output the image in raster (row) format. This can result in padding on the right of the image, if its width is not divisible by 8.
-	 * 
-	 * @throws Exception Where the generated data is unsuitable for the printer (indicates a bug or oversized image).
-	 * @return string The image in raster format.
-	 */
-	public function toRasterFormat() {
-		if($this -> imgRasterData != null) {
-			/* Use previous calculation */
-			return $this -> imgRasterData;
-		}
-		/* Loop through and convert format */
-		$widthPixels = $this -> getWidth();
-		$heightPixels = $this -> getHeight();
-		$widthBytes = $this -> getWidthBytes();
-		$heightBytes = $this -> getHeightBytes();
-		$x = $y = $bit = $byte = $byteVal = 0;
-		$data = str_repeat("\0", $widthBytes * $heightPixels);
-		if(strlen($data) == 0) {
-			return $data;
-		}
-		do {
-			$byteVal |= (int)$this -> imgData[$y * $widthPixels + $x] << (7 - $bit);
-			$x++;
-			$bit++;
-			if($x >= $widthPixels) {
-				$x = 0;
-				$y++;
-				$bit = 8;
-				if($y >= $heightPixels) {
-					$data[$byte] = chr($byteVal);
-					break;
-				}
-			}
-			if($bit >= 8) {
-				$data[$byte] = chr($byteVal);
-				$byteVal = 0;
-				$bit = 0;
-				$byte++;
-			}
-		} while(true);
- 		if(strlen($data) != ($this -> getWidthBytes() * $this -> getHeight())) {
- 			throw new Exception("Bug in " . __FUNCTION__ . ", wrong number of bytes.");
- 		}
- 		$this -> imgRasterData = $data;
- 		return $this -> imgRasterData;
-	}
-	
-	/**
-	 * Output image in column format. This format results in padding at the base and right of the image, if its height and width are not divisible by 8.
-	 */
-	private function toColumnFormat() {
-		/* Note: This function is marked private, as it is not yet used/tested and may be buggy. */
-		$widthPixels = $this -> getWidth();
-		$heightPixels = $this -> getHeight();
-		$widthBytes = $this -> getWidthBytes();
-		$heightBytes = $this -> getHeightBytes();
-		$x = $y = $bit = $byte = $byteVal = 0;
-		$data = str_repeat("\0", $widthBytes * $heightBytes * 8);
- 		do {
- 			$byteVal |= (int)$this -> imgData[$y * $widthPixels + $x] << (8 - $bit);
- 			$y++;
- 			$bit++;
- 			if($y >= $heightPixels) {
- 				$y = 0;
- 				$x++;
- 				$bit = 8;
- 				if($x >= $widthPixels) {
- 					$data[$byte] = chr($byteVal);
- 					break;
- 				}
- 			}
- 			if($bit >= 8) {
- 				$data[$byte] = chr($byteVal);
- 				$byteVal = 0;
- 				$bit = 0;
- 				$byte++;
- 			}
- 		} while(true);
-  		if(strlen($data) != ($widthBytes * $heightBytes * 8)) {
-  			throw new Exception("Bug in " . __FUNCTION__ . ", wrong number of bytes. Should be " . ($widthBytes * $heightBytes * 8) . " but was " . strlen($data));
-  		}
-		return $data;
-	}
-	
-	/**
-	 * @return boolean True if GD is supported, false otherwise (a wrapper for the static version, for mocking in tests)
-	 */
-	protected function isGdSupported() {
-		return self::isGdLoaded();
-	}
-	
-	/**
-	 * @return boolean True if Imagick is supported, false otherwise (a wrapper for the static version, for mocking in tests)
-	 */
-	protected function isImagickSupported() {
-		return self::isImagickLoaded();
-	}
-	
-	
-	/**
-	 * @return boolean True if GD is loaded, false otherwise
-	 */
-	public static function isGdLoaded() {
-		return extension_loaded('gd');
-	}
-	
-	/**
-	 * @return boolean True if Imagick is loaded, false otherwise
-	 */
-	public static function isImagickLoaded() {
-		return extension_loaded('imagick');
-	}
-	
-	/**
-	 * Load a PDF for use on the printer
-	 *
-	 * @param string $pdfFile The file to load
-	 * @param string $pageWidth The width, in pixels, of the printer's output. The first page of the PDF will be scaled to approximately fit in this area.
-	 * @param array $range array indicating the first and last page (starting from 0) to load. If not set, the entire document is loaded.
-	 * @throws Exception Where Imagick is not loaded, or where a missing file or invalid page number is requested.
-	 * @return multitype:EscposImage Array of images, retrieved from the PDF file.
-	 */
-	public static function loadPdf($pdfFile, $pageWidth = 550, array $range = null) {
-		if(!extension_loaded('imagick')) {
-			throw new Exception(__FUNCTION__ . " requires imagick extension.");
-		}
-		/*
-		 * Load first page at very low density (resolution), to figure out what
-		 * density to use to achieve $pageWidth
-		 */
-		try {
-			$image = new Imagick();
-			$testRes = 2; // Test resolution
-			$image -> setresolution($testRes, $testRes);
-			$image -> readimage($pdfFile."[0]");
-			$geo = $image -> getimagegeometry();
-			$image -> destroy();
-			$width = $geo['width'];
-			$newRes = $pageWidth / $width * $testRes;
-			/* Load actual document (can be very slow!) */
-			$rangeStr = ""; // Set to [0] [0-1] page range if $range is set
-			if($range != null) {
-				if(count($range) != 2 || !isset($range[0]) || !is_integer($range[0]) || !isset($range[1]) || !is_integer($range[1]) || $range[0] > $range[1]) {
-					throw new Exception("Invalid range. Must be two numbers in the array: The start and finish page indexes, starting from 0.");
-				}
-				$rangeStr = "[" .  ($range[0] == $range[1] ? $range[0] : implode($range, "-")) . "]";
-			}
-			$image -> setresolution($newRes, $newRes);
-			$image -> readImage($pdfFile."$rangeStr");
-			$pages = $image -> getNumberImages();
-			/* Convert images to Escpos objects */
-			$ret = array();
-			for($i = 0;$i < $pages; $i++) {
-				$image -> setIteratorIndex($i);
-				$ep = new EscposImage();
-				$ep -> readImageFromImagick($image);
-				$ret[] = $ep;
-			}
-			return $ret;
-		} catch(ImagickException $e) {
-			// Wrap in normal exception, so that classes which call this do not themselves require imagick as a dependency.
-			throw new Exception($e);
-		}
-	}
-}
diff --git a/htdocs/includes/escpos/src/EscposPrintBuffer.php b/htdocs/includes/escpos/src/EscposPrintBuffer.php
deleted file mode 100644
index 703bc0a57c0..00000000000
--- a/htdocs/includes/escpos/src/EscposPrintBuffer.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- * 
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- * 
- * 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.
- * 
- * This class manages newlines and character encoding for the target printer, and
- * can be interchanged for an image-bassed buffer (ImagePrintBuffer) if you can't
- * get it operating properly on your machine.
- */
-class EscposPrintBuffer implements PrintBuffer {
-	/**
-	 * @var boolean True to cache output as .gz, false to leave un-compressed (useful for debugging)
-	 */
-	const COMPRESS_CACHE = true;
-
-	/**
-	 * @var string The input encoding of the buffer.
-	 */
-	const INPUT_ENCODING = "UTF-8";
-
-	/**
-	 * @var string Un-recorgnised characters will be replaced with this.
-	 */
-	const REPLACEMENT_CHAR = "?";
-
-	/**
-	 * This array Maps ESC/POS character tables to names iconv encodings
-	 */
-	private $available = null;
-
-	/**
-	 * @var array Maps of UTF-8 to code-pages
-	 */
-	private $encode = null;
-
-	/**
-	 * @var Escpos Printer for output
-	 */
-	private $printer;
-
-	/**
-	 * Empty print buffer.
-	 */
-	function __construct() {
-		$this -> printer = null;
-	}
-
-	public function flush() {
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-		// TODO Not yet implemented for this buffer: This indicates that the printer needs the current line to be ended.
-	}
-
-	public function getPrinter() {
-		return $this -> printer;
-	}
-
-	public function setPrinter(Escpos $printer = null) {
-		$this -> printer = $printer;
-		if($printer != null) {
-			$this -> loadAvailableCharacters();
-		}
-	}
-
-	public function writeText($text) {	
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-		if($text == null) {
-			return;
-		}
-		if(!mb_detect_encoding($text, self::INPUT_ENCODING, true)) {
-			// Assume that the user has already put non-UTF8 into the target encoding.
-			return $this -> writeTextRaw($text);
-		}
-		$i = 0;
-		$j = 0;
-		$len = mb_strlen($text, self::INPUT_ENCODING);
-		while($i < $len) {
-			$matching = true;
-			if(($encoding = $this -> identifyText(mb_substr($text, $i, 1, self::INPUT_ENCODING))) === false) {
-				// Un-encodeable text
-				$encoding = $this -> getPrinter() -> getCharacterTable();
-			}
-			$i++;
-			$j = 1;
-			do {
-				$char = mb_substr($text, $i, 1, self::INPUT_ENCODING);
-				$matching = !isset($this -> available[$char]) || isset($this -> available[$char][$encoding]);
-				if($matching) {
-					$i++;
-					$j++;
-				}
-			} while($matching && $i < $len);
-			$this -> writeTextUsingEncoding(mb_substr($text, $i - $j, $j, self::INPUT_ENCODING), $encoding);
-		}	
-	}
-
-	public function writeTextRaw($text) {
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-		if(strlen($text) == 0) {
-			return;
-		}
-		// Pass only printable characters
-		for($i = 0; $i < strlen($text); $i++) {
-			$c = substr($text, $i, 1);
-			if(!self::asciiCheck($c, true)) {
-				$text[$i] = self::REPLACEMENT_CHAR;
-			}
-		}
-		$this -> write($text);
-	}
-
-	/**
-	 * Return an encoding which we can start to use for outputting this text. Later parts of the text need not be included in the returned code page.
-	 * 
-	 * @param string $text Input text to check.
-	 * @return boolean|integer Code page number, or FALSE if the text is not printable on any supported encoding.
-	 */
-	private function identifyText($text) {
-		// TODO Replace this with an algorithm to choose the encoding which will encode the farthest into the string, to minimise code page changes.
-		$char = mb_substr($text, 0, 1, self::INPUT_ENCODING);
-		if(!isset($this -> available[$char])) {
-			/* Character not available anywhere */
-			return false;
-		}
-		foreach($this -> available[$char] as $encodingNo => $true) {
-			/* Return first code-page where it is available */
-			return $encodingNo;
-		}
-		return false;
-	}
-	
-	/**
-	 * Based on the printer's connector, compute (or load a cached copy of) maps of UTF character to unicode characters for later use.
-	 */
-	private function loadAvailableCharacters() {
-		$supportedCodePages = $this -> printer -> getPrinterCapabilityProfile() -> getSupportedCodePages();
-		$capabilityClassName = get_class($this -> printer -> getPrinterCapabilityProfile());
-		$cacheFile = dirname(__FILE__) . "/cache/Characters-" . $capabilityClassName . ".ser" . (self::COMPRESS_CACHE ? ".gz" : "");
-		$cacheKey = md5(serialize($supportedCodePages));
-		/* Check for pre-generated file */
-		if(file_exists($cacheFile)) {
-			$cacheData = file_get_contents($cacheFile);
-			if(self::COMPRESS_CACHE) {
-				$cacheData = gzdecode($cacheData);
-			}
-			if($cacheData) {
-				$dataArray = unserialize($cacheData);
-				if(isset($dataArray["key"]) && isset($dataArray["available"]) && isset($dataArray["encode"]) && $dataArray["key"] == $cacheKey) {
-					$this -> available = $dataArray["available"];
-					$this -> encode = $dataArray["encode"];
-					return;
-				}
-			}
-		}
-		/* Generate conversion tables */
-		$encode = array();
-		$available = array();
-		$custom = $this -> printer -> getPrinterCapabilityProfile() -> getCustomCodePages();
-		
-		foreach($supportedCodePages as $num => $characterMap) {
-			$encode[$num] = array();
-			if($characterMap === false) {
-				continue;
-			} else if(strpos($characterMap, ":") !== false) {
-				/* Load a pre-defined custom map (vendor-specific code pages) */
-				$i = strpos($characterMap, ":");
-				if(substr($characterMap, 0, $i) !== "custom") {
-					continue;
-				}
-				$i++;
-				$mapName = substr($characterMap, $i, strlen($characterMap) - $i);
-				if(!isset($custom[$mapName]) || mb_strlen($custom[$mapName], self::INPUT_ENCODING) != 128) {
-					throw new Exception("Capability profile referenced invalid custom map '$mapName'.");
-				}
-				$map = $custom[$mapName];
-				for($char = 128; $char <= 255; $char++) {
-					$utf8 = mb_substr($map, $char - 128, 1, self::INPUT_ENCODING);
-					if($utf8 == " ") { // Skip placeholders
-						continue;
-					}
-					if(!isset($available[$utf8])) {
-						$available[$utf8] = array();
-					}
-					$available[$utf8][$num] = true;
-					$encode[$num][$utf8] = chr($char);
-				}
-			} else {
-				/* Generate map using iconv */
-				for($char = 128; $char <= 255; $char++) {
-					$utf8 = @iconv($characterMap, self::INPUT_ENCODING, chr($char));
-					if($utf8 == '') {
-						continue;
-					}
-					if(iconv(self::INPUT_ENCODING, $characterMap, $utf8) != chr($char)) {
-						// Avoid non-canonical conversions
-						continue;
-					}
-					if(!isset($available[$utf8])) {
-						$available[$utf8] = array();
-					}
-					$available[$utf8][$num] = true;
-					$encode[$num][$utf8] = chr($char);
-				}
-			}
-		}
-		/* Use generated data */
-		$dataArray = array("available" => $available, "encode" => $encode, "key" => $cacheKey);
-		$this -> available = $dataArray["available"];
-		$this -> encode = $dataArray["encode"];
-		$cacheData = serialize($dataArray);
-		if(self::COMPRESS_CACHE) {
-			$cacheData = gzencode($cacheData);
-		}
-		/* Attempt to cache, but don't worry if we can't */
-		@file_put_contents($cacheFile, $cacheData);
-	}
-
-	/**
-	 * Encode a block of text using the specified map, and write it to the printer.
-	 * 
-	 * @param string $text Text to print, UTF-8 format.
-	 * @param integer $encodingNo Encoding number to use- assumed to exist.
-	 */
-	private function writeTextUsingEncoding($text, $encodingNo) {
- 		$encodeMap = $this -> encode[$encodingNo];
- 		$len = mb_strlen($text, self::INPUT_ENCODING);
- 		$rawText = str_repeat(self::REPLACEMENT_CHAR, $len);
- 		for($i = 0; $i < $len; $i++) {
- 			$char = mb_substr($text, $i, 1, self::INPUT_ENCODING);
- 			if(isset($encodeMap[$char])) {
- 				$rawText[$i] = $encodeMap[$char];
- 			} else if(self::asciiCheck($char)) {
- 				$rawText[$i] = $char;
- 			}
- 		}
- 		if($this -> printer -> getCharacterTable() != $encodingNo) {
- 			$this -> printer -> selectCharacterTable($encodingNo);
- 		}
-		$this -> writeTextRaw($rawText);
-	}
-
-	/**
-	 * Write data to the underlying printer.
-	 * 
-	 * @param string $data
-	 */
-	private function write($data) {
-		$this -> printer -> getPrintConnector() -> write($data);
-	}
-
-	/**
-	 * Return true if a character is an ASCII printable character.
-	 *
-	 * @param string $char Character to check
-	 * @param boolean $extended True to allow 128-256 values also (excluded by default)
-	 * @return boolean True if the character is printable, false if it is not.
-	 */
-	private static function asciiCheck($char, $extended = false) {
-		if(strlen($char) != 1) {
-			// Multi-byte string
-			return false;
-		}
-		$num = ord($char);
-		if($num > 31 && $num < 127) { // Printable
-			return true;
-		}
-		if($num == 10) { // New-line (printer will take these)
-			return true;
-		}
-		if($extended && $num > 127) {
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/htdocs/includes/escpos/src/FilePrintConnector.php b/htdocs/includes/escpos/src/FilePrintConnector.php
deleted file mode 100644
index 8d87f0a527a..00000000000
--- a/htdocs/includes/escpos/src/FilePrintConnector.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- * 
- * PrintConnector for passing print data to a file.
- */
-class FilePrintConnector implements PrintConnector {
-	/**
-	 * @var resource The file pointer to send data to.
-	 */
-	protected $fp;
-
-	/**
-	 * Construct new connector, given a filename
-	 * 
-	 * @param string $filename
-	 */
-	public function __construct($filename) {
-		$this -> fp = fopen($filename, "wb+");
-		if($this -> fp === false) {
-			throw new Exception("Cannot initialise FilePrintConnector.");
-		}
-	}
-
-	public function __destruct() {
-		if($this -> fp !== false) {
-			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
-		}
-	}
-
-	/**
-	 * Close file pointer
-	 */
-	public function finalize() {
-		fclose($this -> fp);
-		$this -> fp = false;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see PrintConnector::read()
-	 */
-	public function read($len) {
-		rewind($this -> fp);
-		return fgets($this -> fp, $len + 1);
-	}
-	
-	/**
-	 * Write data to the file
-	 * 
-	 * @param string $data
-	 */
-	public function write($data) {
-		fwrite($this -> fp, $data);
-	}
-}
diff --git a/htdocs/includes/escpos/src/ImagePrintBuffer.php b/htdocs/includes/escpos/src/ImagePrintBuffer.php
deleted file mode 100644
index 08ca64ac43e..00000000000
--- a/htdocs/includes/escpos/src/ImagePrintBuffer.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- *
- * This class renders text to small images on-the-fly. It attempts to mimic the
- * behaviour of text output, whilst supporting any fonts & character encodings
- * which your system can handle. This class currently requires Imagick.
- */
-class ImagePrintBuffer implements PrintBuffer {
-	private $printer;
-	
-	function __construct() {
-		if(!EscposImage::isImagickLoaded()) {
-			throw new Exception("ImagePrintBuffer requires the imagick extension");
-		}
-	}
-
-	function flush() {
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-	}
-
-	function getPrinter() {
-		return $this -> printer;
-	}
-
-	function setPrinter(Escpos $printer = null) {
-		$this -> printer = $printer;
-	}
-
-	function writeText($text) {
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-		if($text == null) {
-			return;
-		}
-		$text = trim($text, "\n");
-		/* Create Imagick objects */
-		$image = new Imagick();
-		$draw = new ImagickDraw();
-		$color = new ImagickPixel('#000000');
-		$background = new ImagickPixel('white');
-
-		/* Create annotation */
-		//$draw -> setFont('Arial');// (not necessary?)
-		$draw -> setFontSize(24); // Size 21 looks good for FONT B
-		$draw -> setFillColor($color);
-		$draw -> setStrokeAntialias(true);
-		$draw -> setTextAntialias(true);
-		$metrics = $image -> queryFontMetrics($draw, $text);
-		$draw -> annotation(0, $metrics['ascender'], $text);
-
-		/* Create image & draw annotation on it */
-		$image -> newImage($metrics['textWidth'], $metrics['textHeight'], $background);
-		$image -> setImageFormat('png');
-		$image -> drawImage($draw);
-		//$image -> writeImage("test.png");
-		
-		/* Save image */
-		$escposImage = new EscposImage();
-		$escposImage -> readImageFromImagick($image);
-		$size = Escpos::IMG_DEFAULT;
-		$this -> printer -> bitImage($escposImage, $size);
-	}
-
-	function writeTextRaw($text) {
-		if($this -> printer == null) {
-			throw new LogicException("Not attached to a printer.");
-		}
-		$this -> printer -> getPrintConnector() -> write($data);
-	}
-}
diff --git a/htdocs/includes/escpos/src/NetworkPrintConnector.php b/htdocs/includes/escpos/src/NetworkPrintConnector.php
deleted file mode 100644
index 4dd2c39f115..00000000000
--- a/htdocs/includes/escpos/src/NetworkPrintConnector.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- * 
- * PrintConnector for directly opening a network socket to a printer to send it commands.
- */
-class NetworkPrintConnector extends FilePrintConnector {
-	public function __construct($ip, $port = "9100") {
-		$this -> fp = @fsockopen($ip, $port, $errno, $errstr);
-		if($this -> fp === false) {
-			throw new Exception("Cannot initialise NetworkPrintConnector: " . $errstr);
-		}
-	}
-}
diff --git a/htdocs/includes/escpos/src/P822DCapabilityProfile.php b/htdocs/includes/escpos/src/P822DCapabilityProfile.php
deleted file mode 100644
index 7c3b5abe6dd..00000000000
--- a/htdocs/includes/escpos/src/P822DCapabilityProfile.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * This capability profile is designed for the P-822D.
- * 
- * See
- * https://github.com/mike42/escpos-php/issues/50
- */
-class P822DCapabilityProfile extends DefaultCapabilityProfile {
-	function getSupportedCodePages() {
-		return array(
-			0 => CodePage::CP437,
-			1 => false, // Katakana
-			2 => CodePage::CP850,
-			3 => CodePage::CP860,
-			4 => CodePage::CP863,
-			5 => CodePage::CP865,
-			6 => false, // Western Europe
-			7 => false, // Greek
-			8 => false, // Hebrew
-			9 => false, // Eastern europe
-			10 => false, // Iran
-			16 => CodePage::CP1252 ,
-			17 => CodePage::CP866 ,
-			18 => CodePage::CP852 ,
-			19 => CodePage::CP858,
-			20 => false, // Iran II
-			21 => false, // latvian
-			22 => false,  //Arabic
-			23 => false, // PT151, 1251
-			24 => CodePage::CP747,
-			25 => CodePage::CP1257,
-			27 => false, // Vietnam,
-			28 => CodePage::CP864,
-			29 => CodePage::CP1001,
-			30 => false, // Uigur
-			31 => false, // Hebrew
-			32 => CodePage::CP1255,
-			33 => CodePage::CP720,
-			34 => CodePage::CP1256,
-			35 => CodePage::CP1257,
-			255 => false, // Thai
-			
-			50 => CodePage::CP437,
-			51 => false, // Jatakana,
-			52 => CodePage::CP437,
-			53 => CodePage::CP858,
-			54 => CodePage::CP852,
-			55 => CodePage::CP860,
-			56 => CodePage::CP861,
-			57 => CodePage::CP863,
-			58 => CodePage::CP865,
-			59 => CodePage::CP866,
-			60 => CodePage::CP855,
-			61 => CodePage::CP857,
-			62 => CodePage::CP862,
-			63 => CodePage::CP864,
-			64 => CodePage::CP737,
-			65 => CodePage::CP851,
-			66 => CodePage::CP869,
-			67 => CodePage::CP928,
-			68 => CodePage::CP772,
-			69 => CodePage::CP774,
-			70 => CodePage::CP874,
-			71 => CodePage::CP1252,
-			72 => CodePage::CP1250,
-			73 => CodePage::CP1251,
-			74 => CodePage::CP3840,
-			75 => CodePage::CP3841,
-			76 => CodePage::CP3843,
-			77 => CodePage::CP3844,
-			78 => CodePage::CP3845,
-			79 => CodePage::CP3846,
-			80 => CodePage::CP3847,
-			81 => CodePage::CP3848,
-			82 => CodePage::CP1001,
-			83 => CodePage::CP2001,
-			84 => CodePage::CP3001,
-			85 => CodePage::CP3002,
-			86 => CodePage::CP3011,
-			87 => CodePage::CP3012,
-			88 => CodePage::CP3021,
-			89 => CodePage::CP3041
-		);
-	}
-	
-	public function getSupportsGraphics() {
-		/* Ask the driver to use bitImage wherever possible instead of graphics */
-		return false;
-	}
-}
diff --git a/htdocs/includes/escpos/src/PrintBuffer.php b/htdocs/includes/escpos/src/PrintBuffer.php
deleted file mode 100644
index 9e3b110085f..00000000000
--- a/htdocs/includes/escpos/src/PrintBuffer.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- * 
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- * 
- * 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.
- * 
- * Print buffers manage newlines and character encoding for the target printer.
- * They are used as a swappable component: text or image-based output.
- * 
- * - Text output (EscposPrintBuffer) is the fast default, and is recommended for
- *   most people, as the text output can be more directly manipulated by ESC/POS
- *   commands.
- * - Image output (ImagePrintBuffer) is designed to accept more encodings than the
- *   physical printer supports, by rendering the text to small images on-the-fly.
- *   This takes a lot more CPU than sending text, but is necessary for some users.
- * - If your use case fits outside these, then a further speed/flexibility trade-off
- *   can be made by printing directly from generated HTML or PDF.
- */
-interface PrintBuffer {
-	/**
-	 * Cause the buffer to send any partial input and wait on a newline.
-	 * If the printer is already on a new line, this does nothing.
-	 */
-	function flush();
-
-	/**
-	 * Used by Escpos to check if a printer is set.
-	 */
-	function getPrinter();
-
-	/**
-	 * Used by Escpos to hook up one-to-one link between buffers and printers.
-	 * 
-	 * @param Escpos $printer New printer
-	 */
-	function setPrinter(Escpos $printer = null);
-
-	/**
-	 * Accept UTF-8 text for printing.
-	 * 
-	 * @param string $text Text to print
-	 */
-	function writeText($text);
-
-	/**
-	 * Accept 8-bit text in the current encoding and add it to the buffer.
-	 * 
-	 * @param string $text Text to print, already the target encoding.
-	 */
-	function writeTextRaw($text);
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/PrintConnector.php b/htdocs/includes/escpos/src/PrintConnector.php
deleted file mode 100644
index f1d37be9c55..00000000000
--- a/htdocs/includes/escpos/src/PrintConnector.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- * 
- * Interface passed to Escpos class for receiving print data. Print connectors
- * are responsible for transporting this to the actual printer.
- */
-interface PrintConnector {
-	/**
-	 * Print connectors should cause a NOTICE if they are deconstructed
-	 * when they have not been finalized.
-	 */
-	public function __destruct();
-
-	/**
-	 * Finish using this print connector (close file, socket, send
-	 * accumulated output, etc).
-	 */
-	public function finalize();
-
-	/**
-	 * @param string $data
-	 * @return Data read from the printer, or false where reading is not possible.
-	 */
-	public function read($len);
-	
-	/**
-	 * @param string $data
-	 */
-	public function write($data);
-}
diff --git a/htdocs/includes/escpos/src/SimpleCapabilityProfile.php b/htdocs/includes/escpos/src/SimpleCapabilityProfile.php
deleted file mode 100644
index 7076b5e16cb..00000000000
--- a/htdocs/includes/escpos/src/SimpleCapabilityProfile.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * This capability profile is designed for non-Epson printers sold online. Without knowing
- * their character encoding table, only CP437 output is assumed, and graphics() calls will
- * be disabled, as it usually prints junk on these models.
- */
-class SimpleCapabilityProfile extends DefaultCapabilityProfile {
-	function getSupportedCodePages() {
-		/* Use only CP437 output */
-		return array(0 => CodePage::CP437);
-	}
-	
-	public function getSupportsGraphics() {
-		/* Ask the driver to use bitImage wherever possible instead of graphics */
-		return false;
-	}
-}
diff --git a/htdocs/includes/escpos/src/StarCapabilityProfile.php b/htdocs/includes/escpos/src/StarCapabilityProfile.php
deleted file mode 100644
index f61774a5e30..00000000000
--- a/htdocs/includes/escpos/src/StarCapabilityProfile.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-class StarCapabilityProfile extends DefaultCapabilityProfile {
-	function getCustomCodePages() {
-		// Code table reference: http://www.starmicronics.com/support/mannualfolder/sp2000pm.pdf
-		return array(
-			'CP3011' => "ÇüéâäàåçêëèïîìÄÅ" . 
-						"ÉæÆôöòûùÿÖÜ¢£¥₧ƒ" . 
-						"áíóúñѪº¿⌐¬½¼¡«»" . 
-						"░▒▓│┤Ā╢ņ╕╣║╗╝╜╛┐" . 
-						"└┴┬├─┼ā╟╚╔╩╦╠═╬╧" . 
-						"Š╤čČ╘╒ģĪī┘┌█▄ūŪ▀" . 
-						"αßΓπΣσµτΦΘΩδ∞φε∩" . 
-						"ĒēĢķĶļĻžŽ∙·√Ņš■ ",
-			'CP3012' => "АБВГДЕЖЗИЙКЛМНОП" . 
-						"РСТУФХЦЧШЩЪЫЬЭЮЯ" . 
-						"абвгдежзийклмноп" . 
-						"░▒▓│┤Ā╢ņ╕╣║╗╝Ō╛┐" . 
-						"└┴┬├─┼ā╟╚╔╩╦╠═╬╧" . 
-						"Š╤čČ╘╒ģĪī┘┌█▄ūŪ▀" . 
-						"рстуфхцчшщъыьэюя" . 
-						"ĒēĢķĶļĻžŽ∙·√Ņš■ "
-		);
-	}
-
-	function getSupportedCodePages() {
-		return array(
-				0 => CodePage::CP437, // "Normal"
-				1 => CodePage::CP437,
-				2 => CodePage::CP932,
-				3 => CodePage::CP437, 
-				4 => CodePage::CP858,
-				5 => CodePage::CP852,
-				6 => CodePage::CP860,
-				7 => CodePage::CP861,
-				8 => CodePage::CP863,
-				9 => CodePage::CP865,
-				10 => CodePage::CP866,
-				11 => CodePage::CP855,
-				12 => CodePage::CP857,
-				13 => CodePage::CP862,
-				14 => CodePage::CP864,
-				15 => CodePage::CP737,
-				16 => CodePage::CP851,
-				17 => CodePage::CP869,
-				18 => CodePage::CP928,
-				19 => CodePage::CP772,
-				20 => CodePage::CP774,
-				21 => CodePage::CP874,
-				32 => CodePage::CP1252,
-				33 => CodePage::CP1250,
-				34 => CodePage::CP1251,
-				64 => CodePage::CP3840,
-				65 => CodePage::CP3841,
-				66 => CodePage::CP3843,
-				67 => CodePage::CP3844,
-				68 => CodePage::CP3845,
-				69 => CodePage::CP3846,
-				70 => CodePage::CP3847,
-				71 => CodePage::CP3848,
-				72 => CodePage::CP1001,
-				73 => CodePage::CP2001,
-				74 => CodePage::CP3001,
-				75 => CodePage::CP3002,
-				76 => 'custom:CP3011',
-				77 => 'custom:CP3012',
-				78 => CodePage::CP3021,
-				79 => CodePage::CP3041,
-				96 => false, // Thai Character Code 42
-				97 => false, // Thai Character Code 11
-				98 => false, // Thai Character Code 13
-				99 => false, // Thai Character Code 14
-				100 => false, // Thai Character Code 16
-				101 => false, // Thai Character Code 17
-				102 => false, // Thai Character Code 18
-				255 => false);
-	}
-
-	function getSupportsStarCommands() {
-		/* Allows Escpos.php to substitute emulated ESC/POS commands with native ones for this printer. */ 
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/src/WindowsPrintConnector.php b/htdocs/includes/escpos/src/WindowsPrintConnector.php
deleted file mode 100644
index 2d3314ee698..00000000000
--- a/htdocs/includes/escpos/src/WindowsPrintConnector.php
+++ /dev/null
@@ -1,356 +0,0 @@
-<?php
-/**
- * escpos-php, a Thermal receipt printer library, for use with
- * ESC/POS compatible printers.
- *
- * Copyright (c) 2014-2015 Michael Billington <michael.billington@gmail.com>,
- * 	incorporating modifications by:
- *  - Roni Saha <roni.cse@gmail.com>
- *  - Gergely Radics <gerifield@ustream.tv>
- *  - Warren Doyle <w.doyle@fuelled.co>
- *
- * 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.
- * 
- * Connector for sending print jobs to
- * - local ports on windows (COM1, LPT1, etc)
- * - shared (SMB) printers from any platform (\\server\foo)
- * For USB printers or other ports, the trick is to share the printer with a generic text driver, then access it locally.
- */
-class WindowsPrintConnector implements PrintConnector {
-	/**
-	 * @var array Accumulated lines of output for later use.
-	 */
-	private $buffer;
-
-	/**
-	 * @var string The hostname of the target machine, or null if this is a local connection.
-	 */
-	private $hostname;
-
-	/**
-	 * @var boolean True if a port is being used directly (must be Windows), false if network shares will be used.
-	 */
-	private $isLocal;
-
-	/**
-	 * @var int Platform we're running on, for selecting different commands. See PLATFORM_* constants.
-	 */
-	private $platform;
-
-	/**
-	 * @var string The name of the target printer (eg "Foo Printer") or port ("COM1", "LPT1").
-	 */
-	private $printerName;
-
-	/**
-	 * @var string Login name for network printer, or null if not using authentication.
-	 */
-	private $userName;
-
-	/**
-	 * @var string Password for network printer, or null if no password is required.
-	 */
-	private $userPassword;
-
-	/**
-	 * @var string Workgroup that the printer is located on
-	 */
-	private $workgroup;
-
-	/**
-	 * @var int represents Linux
-	 */
-	const PLATFORM_LINUX = 0;
-
-	/**
-	 * @var int represents Mac
-	 */
-	const PLATFORM_MAC = 1;
-
-	/**
-	 * @var int represents Windows
-	 */
-	const PLATFORM_WIN = 2;
-
-	/**
-	 * @var string Valid local ports.
-	 */
-	const REGEX_LOCAL = "/^(LPT\d|COM\d)$/";
-
-	/**
-	 * @var string Valid printer name.
-	 */
-	const REGEX_PRINTERNAME = "/^(\w-+)(\s\w-*)*$/";
-
-	/**
-	 * @var string Valid smb:// URI containing hostname & printer with optional user & optional password only.
-	 */
-	const REGEX_SMB = "/^smb:\/\/(\s\w-+(:\s\w-+)?@)?[\w-]+\/([\w-]+\/)?(\w-+)(\s\w-+)*$/";
-
-	/**
-	 * @param string $dest
-	 * @throws BadMethodCallException
-	 */
-	public function __construct($dest) {
-		$this -> platform = $this -> getCurrentPlatform();	
-		$this -> isLocal = false;
-		$this -> buffer = null;
-		$this -> userName = null;
-		$this -> userPassword = null;
-		$this -> workgroup = null;
-		if(preg_match(self::REGEX_LOCAL, $dest) == 1) {
-			// Straight to LPT1, COM1 or other local port. Allowed only if we are actually on windows.
-			if($this -> platform !== self::PLATFORM_WIN) {
-				throw new BadMethodCallException("WindowsPrintConnector can only be used to print to a local printer ('".$dest."') on a Windows computer.");
-			}
-			$this -> isLocal = true;
-			$this -> hostname = null;
-			$this -> printerName = $dest;
-		} else if(preg_match(self::REGEX_SMB, $dest) == 1) {
-			// Connect to samba share, eg smb://host/printer
-			$part = parse_url($dest);
-			$this -> hostname = $part['host'];
-			/* Printer name and optional workgroup */
-			$path = ltrim($part['path'], '/');
-			if(strpos($path, "/") !== false) {
-				$pathPart = explode("/", $path);
-				$this -> workgroup = $pathPart[0];
-				$this -> printerName = $pathPart[1];
-			} else {
-				$this -> printerName = $path;
-			}
-			/* Username and password if set */
-			if(isset($part['user'])) {
-				$this -> userName = $part['user'];
-				if(isset($part['pass'])) {
-					$this -> userPassword = $part['pass'];
-				}
-			}
-		} else if(preg_match(self::REGEX_PRINTERNAME, $dest) == 1) {
-			// Just got a printer name. Assume it's on the current computer.
-			$hostname = gethostname();
-			if(!$hostname) {
-				$hostname = "localhost";
-			}
-			$this -> hostname = $hostname;
-			$this -> printerName = $dest;
-		} else {
-			throw new BadMethodCallException("Printer '" . $dest . "' is not a valid printer name. Use local port (LPT1, COM1, etc) or smb://computer/printer notation.");
-		}
-		$this -> buffer = array();
-	}
-
-	public function __destruct() {
-		if($this -> buffer !== null) {
-			trigger_error("Print connector was not finalized. Did you forget to close the printer?", E_USER_NOTICE);
-		}
-	}
-
-	public function finalize() {
-		$data = implode($this -> buffer);
-		$this -> buffer = null;
-		if($this -> platform == self::PLATFORM_WIN) {
-			$this -> finalizeWin($data);
-		} else if($this -> platform == self::PLATFORM_LINUX) {
-			$this -> finalizeLinux($data);
-		} else {
-			$this -> finalizeMac($data);
-		}
-	}
-
-	/**
-	 * Send job to printer -- platform-specific Linux code.
-	 * 
-	 * @param string $data Print data
-	 * @throws Exception
-	 */
-	protected function finalizeLinux($data) {
-		/* Non-Windows samba printing */
-		$device = "//" . $this -> hostname . "/" . $this -> printerName;
-		if($this -> userName !== null) {
-			$user = ($this -> workgroup != null ? ($this -> workgroup . "\\") : "") . $this -> userName;
-			if($this -> userPassword == null) {
-				// No password
-				$command = sprintf("smbclient %s -U %s -c %s -N",
-						escapeshellarg($device),
-						escapeshellarg($user),
-						escapeshellarg("print -"));
-				$redactedCommand = $command;
-			} else {
-				// With password
-				$command = sprintf("smbclient %s %s -U %s -c %s",
-						escapeshellarg($device),
-						escapeshellarg($this -> userPassword),
-						escapeshellarg($user),
-						escapeshellarg("print -"));
-				$redactedCommand = sprintf("smbclient %s %s -U %s -c %s",
-						escapeshellarg($device),
-						escapeshellarg("*****"),
-						escapeshellarg($user),
-						escapeshellarg("print -"));
-			}
-		} else {
-			// No authentication information at all
-			$command = sprintf("smbclient %s -c %s -N",
-					escapeshellarg($device),
-					escapeshellarg("print -"));
-			$redactedCommand = $command;
-		}
-		$retval = $this -> runCommand($command, $outputStr, $errorStr, $data);
-		if($retval != 0) {
-			throw new Exception("Failed to print. Command \"$redactedCommand\" failed with exit code $retval: " . trim($outputStr));
-		}
-	}
-	
-	protected function finalizeMac($data) {
-		throw new Exception("Mac printing not implemented.");
-	}
-	
-	/**
-	 * Send data to printer -- platform-specific Windows code.
-	 * 
-	 * @param string $data
-	 */
-	protected function finalizeWin($data) {
-		/* Windows-friendly printing of all sorts */
-		if(!$this -> isLocal) {
-			/* Networked printing */
-			$device = "\\\\" . $this -> hostname . "\\" . $this -> printerName;
-			if($this -> userName !== null) {
-				/* Log in */
-				$user = "/user:" . ($this -> workgroup != null ? ($this -> workgroup . "\\") : "") . $this -> userName;
-				if($this -> userPassword == null) {
-					$command = sprintf("net use %s %s",
-							escapeshellarg($device),
-							escapeshellarg($user));
-					$redactedCommand = $command;
-				} else {
-					$command = sprintf("net use %s %s %s",
-							escapeshellarg($device),
-							escapeshellarg($user),
-							escapeshellarg($this -> userPassword));
-					$redactedCommand = sprintf("net use %s %s %s",
-							escapeshellarg($device),
-							escapeshellarg($user),
-							escapeshellarg("*****"));
-				}
-				$retval = $this -> runCommand($command, $outputStr, $errorStr);
-				if($retval != 0) {
-					throw new Exception("Failed to print. Command \"$redactedCommand\" failed with exit code $retval: " . trim($errorStr));
-				}
-			}
-			/* Final print-out */
-			$filename = tempnam(sys_get_temp_dir(), "escpos");
-			file_put_contents($filename, $data);
-			if(!$this -> runCopy($filename, $device)){
-				throw new Exception("Failed to copy file to printer");
-			}
-			unlink($filename);
-		} else {
-			/* Drop data straight on the printer */
-			if(!$this -> runWrite($data,  $this -> printerName)) {
-				throw new Exception("Failed to write file to printer at " . $this -> printerName);
-			}
-		}
-	}
-	
-	/**
-	 * @return string Current platform. Separated out for testing purposes.
-	 */
-	protected function getCurrentPlatform() {
-		if(PHP_OS == "WINNT") {
-			return self::PLATFORM_WIN;
-		}
-		if(PHP_OS == "Darwin") {
-			return self::PLATFORM_MAC;
-		}
-		return self::PLATFORM_LINUX;
-	}
-	
-	/* (non-PHPdoc)
-	 * @see PrintConnector::read()
-	 */
-	public function read($len) {
-		/* Two-way communication is not supported */
-		return false;
-	}
-	
-	/**
-	 * Run a command, pass it data, and retrieve its return value, standard output, and standard error.
-	 * 
-	 * @param string $command the command to run.
-	 * @param string $outputStr variable to fill with standard output.
-	 * @param string $errorStr variable to fill with standard error.
-	 * @param string $inputStr text to pass to the command's standard input (optional).
-	 * @return number
-	 */
-	protected function runCommand($command, &$outputStr, &$errorStr, $inputStr = null) {
-		$descriptors = array(
-				0 => array("pipe", "r"),
-				1 => array("pipe", "w"),
-				2 => array("pipe", "w"),
-		);
-		$process = proc_open($command, $descriptors, $fd);
-		if (is_resource($process)) {
-			/* Write to input */
-			if($inputStr !== null) {
-				fwrite($fd[0], $inputStr);
-			}
-			fclose($fd[0]);
-			/* Read stdout */
-			$outputStr = stream_get_contents($fd[1]);
-			fclose($fd[1]);
-			/* Read stderr */
-			$errorStr = stream_get_contents($fd[2]);
-			fclose($fd[2]);
-			/* Finish up */
-			$retval = proc_close($process);
-			return $retval;
-		} else {
-			/* Method calling this should notice a non-zero exit and print an error */
-			return -1;
-		}
-	}
-	
-	/**
-	 * Copy a file. Separated out so that nothing is actually printed during test runs.
-	 * 
-	 * @param string $from Source file
-	 * @param string $to Destination file
-	 * @return boolean True if copy was successful, false otherwise
-	 */
-	protected function runCopy($from, $to) {
-		return copy($from, $to);
-	}
-	
-	/**
-	 * Write data to a file. Separated out so that nothing is actually printed during test runs.
-	 * 
-	 * @param string $data Data to print
-	 * @param string $to Destination file
-         * @return boolean True if write was successful, false otherwise
-	 */
-	protected function runWrite($data, $to) {
-		return file_put_contents($data, $to) !== false;
-	}
-
-	public function write($data) {
-		$this -> buffer[] = $data;
-	}
-}
diff --git a/htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-DefaultCapabilityProfile.ser.gz
deleted file mode 100644
index 43ad39d229582af5ad7121088bf2c6287e067e11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12928
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

diff --git a/htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-SimpleCapabilityProfile.ser.gz
deleted file mode 100644
index 288b7d3740782fbcc9d9a28d71a6ecc330683eb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1116
zcmV-i1f%;OiwFP!0000019jGCa}-Aq2H^j4zu=@ppj-W#6S@x+l>LD!S5XvI%G|-(
zDBPZM&N)j+LdafhIRGb;P0kqyYz!D2xgGlLa@lWxQt7$b*`As1-br{d@8Etf?nM$G
zCHCw~l<!MM$`W2tacRiKUgXqa_rG^=j~6W~_ln96z2_60$2j+M9^~B1d5H4}=W)&x
zoJTp&aGvHo$+?zu9p^OXVb1lO7dbC;p69&Id6n}f=N#uw$^p-lV1P48h?p0-SIskG
ztBHrw$9anL0_Qc(bDSIbdU(nPeC~j3c)0pZ10T+lGuYtF%RAtE74V`8NCJfs=E(A$
zlLK<z%spFeIB6@P`y_hjB<q}$+;#37PSVu5v0lH$@Giqi(Kzog_JL%A^Q_^dYd9yV
z<J^cRTWL5+Di?pZ;XQ`88*Z%2Cm$u}q^CM3-yi43e)`7#_@oaxCm$Q<R^A$Y&Tlik
z)o`P}e51a6Qr6B%pK|AGyf>RM>N;gO`CvM?<}uDCNAj@HmhwhZCfOE_CYw{>ZDVf!
zrP{9H4RVQ(<`;%MzXIgRu7}KTVtJ#+Q=|sNQ26~KPXc$d7?qYbz8mBu+;Ah|(?)@0
zjDpP=pY|1FdXkS}l(WWSN%@7tjoDL1*Q(+dr+{3_TvGGPaqvGb_)ag9{9yNo70G}7
zmiW)zet+SINM-m}ZuJhT0Am8xfPR4*z@R`apjV&{FeFe97!f!O7#BzZCIr%eQGp|X
z8G)mKX@Lx2Qs84it-vRMI)P(=v_J!3SfCM5FVF;76lex43uFQF0zP0}AO~0#XaQ^r
zv;uMhZGcXJc7Xur(g7F{=mg*xy28J>Cp+nuAzMuXJ$Ox@KrdiQpbxMh&<|J>7y!%(
z3<4Sjh7cK!e;9x{MgZ85QN*5U5E;V|9QQb2Ltp}c<emgzbyEPO-82A4HG}u&5d5qP
zHf>I&S!5oPtrl5OLD?)qd_=RPf-_xKK_0BA_#($uaPX@th<Qz=MPyy2OXP$KQfxz|
zL*%5c0;jO4k`?(>1r_p{3XUpJ!MjeWREm7Ag5&!_<LMUJQt1)-Ql(wwD-}fewF;Wt
zH!7(6(<<m{XH>BEvnp6uUIi7lt%62&P6e58UImqUL8VRPqDrgCB^Bi1w<^fP?^KZB
zmsL=ES9G5-^Hr6M$TiLIl*n}zG}jv{c<QDKcI=i4PWiSJTprEh4w?l{^e#qVQTGJ4
zF~@z3Kmk0!h#G;1DC;GGM;L+VA7c(Az!Ly=<tYG3^9+DI{~oJLAwPe>Yw-2>5zioy
zpY$0_`y7%+U-%i(V~>8(AxM}PDoCndAsHm_OBGD~3VXdG@LH$AIsb-t&kDTJfRUPS
zF$A;xu0v3Re?Y3x&;P_j_(=YxseyR^#t^_i5qG&M4BDGK;D#4|jh0lz<Hft;#nE_C
iNi4Rzv|>kjbXRFnB3hb^MN8s^XWjvL>zN7b6aWBu>k}&g

diff --git a/htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz b/htdocs/includes/escpos/src/cache/Characters-StarCapabilityProfile.ser.gz
deleted file mode 100644
index e0bb0e5fec5c59a4131ae1f2f4151d392f435b91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9416
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

diff --git a/htdocs/includes/escpos/test/bootstrap.php b/htdocs/includes/escpos/test/bootstrap.php
deleted file mode 100644
index 41b04f5ca6b..00000000000
--- a/htdocs/includes/escpos/test/bootstrap.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-error_reporting(E_ALL);
-ini_set('display_errors', 1);
-
-require_once(dirname(__FILE__) . "/../vendor/autoload.php");
-require_once(dirname(__FILE__) . "/../Escpos.php");
-require_once(dirname(__FILE__) . "/../src/DummyPrintConnector.php");
-
-/**
- * Used in many of the tests to to output known-correct
- * strings for use in tests. 
- */
-function friendlyBinary($in) {
-	if(strlen($in) == 0) {
-		return $in;
-	}
-	/* Print out binary data with PHP \x00 escape codes,
-	 for builting test cases. */
-	$chars = str_split($in);
-	foreach($chars as $i => $c) {
-		$code = ord($c);
-		if($code < 32 || $code > 126) {
-			$chars[$i] = "\\x" . bin2hex($c);
-		}
-	}
-	return implode($chars);
-}
diff --git a/htdocs/includes/escpos/test/integration/ExampleTest.php b/htdocs/includes/escpos/test/integration/ExampleTest.php
deleted file mode 100644
index 689891e2432..00000000000
--- a/htdocs/includes/escpos/test/integration/ExampleTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-class ExampleTest extends PHPUnit_Framework_TestCase {
-	/* Verify that the examples don't fizzle out with fatal errors */
-	private $exampleDir;
-	
-	public function setup() {
-		$this -> exampleDir = dirname(__FILE__) . "/../../example/";
-	}
-	
-	public function testBitImage() {
-		$this -> requireGraphicsLibrary();
-		$outp = $this -> runExample("bit-image.php");
-		$this -> outpTest($outp, "bit-image.bin");
-	}
-	
-	public function testCharacterEncodings() {
-		$outp = $this -> runExample("character-encodings.php");
-		$this -> outpTest($outp, "character-encodings.bin");
-	}
-	
-	public function testCharacterTables() {
-		$outp = $this -> runExample("character-tables.php");
-		$this -> outpTest($outp, "character-tables.bin");
-	}
-	
-	private function outpTest($outp, $fn) {
-		$file = dirname(__FILE__) . "/resources/output/".$fn;
-		if(!file_exists($file)) {
-			file_put_contents($file, $outp);
-		}
-		$this -> assertEquals($outp, file_get_contents($file));
-	}
-	
-	public function testDemo() {
-		$this -> requireGraphicsLibrary();
-		$outp = $this -> runExample("demo.php");
-		$this -> outpTest($outp, "demo.bin");
-	}
-	
-	public function testGraphics() {
-		$this -> requireGraphicsLibrary();
-		$outp = $this -> runExample("graphics.php");
-		$this -> outpTest($outp, "graphics.bin");
-	}
-	
-	public function testReceiptWithLogo() {
-		$this -> requireGraphicsLibrary();
-		$outp = $this -> runExample("receipt-with-logo.php");
-		$this -> outpTest($outp, "receipt-with-logo.bin");
-	}
-	
-	public function testQrCode() {
-		$outp = $this -> runExample("qr-code.php");
-		$this -> outpTest($outp, "qr-code.bin");
-	}
-
-	public function testBarcode() {
-		$outp = $this -> runExample("barcode.php");
-		$this -> outpTest($outp, "barcode.bin");
-	}
-	
-	public function testTextSize() {
-		$outp = $this -> runExample("text-size.php");
-		$this -> outpTest($outp, "text-size.bin");
-	}
-
-	/**
-	 * @large
-	 */
-	public function testPrintFromPdf() {
-		if(!EscposImage::isImagickLoaded()) {
-			$this -> markTestSkipped("imagick plugin required for this test");
-		}
-		$outp = $this -> runExample("print-from-pdf.php");
-		$this -> outpTest(gzcompress($outp, 9), "print-from-pdf.bin.z"); // Compressing output because it's ~1MB
-	}
-
-	public function testInterfaceEthernet() {
-		// Test attempts DNS lookup on some machine
-		$outp = $this -> runExample("interface/ethernet.php");
-		$this -> outpTest($outp, "interface.bin");
-	}
-	
-	public function testInterfaceLinuxUSB() {
-		$outp = $this -> runExample("interface/linux-usb.php");
-		$this -> outpTest($outp, "interface.bin");
-	}
-	
-	public function testInterfaceWindowsUSB() {
-		// Output varies between platforms, not checking.
-		$outp = $this -> runExample("interface/windows-usb.php");
-		$this -> outpTest($outp, "interface.bin");
-	}
-	
-	public function testInterfaceSMB() {
-		// Output varies between platforms, not checking.
-		$outp = $this -> runExample("interface/smb.php");
-		$this -> outpTest($outp, "interface.bin");
-	}
-	
-	public function testInterfaceWindowsLPT() {
-		// Output varies between platforms, not checking.
-		$outp = $this -> runExample("interface/windows-lpt.php");
-		$this -> outpTest($outp, "interface.bin");
-	}
-	
-	private function runExample($fn) {
-		// Change directory and check script
-		chdir($this -> exampleDir);
-		$this -> assertTrue(file_exists($fn), "Script $fn not found.");
-		// Run command and save output
-		ob_start();
-		passthru("php " . escapeshellarg($fn), $retval);
-		$outp = ob_get_contents();
-		ob_end_clean();
-		// Check return value
-		$this -> assertEquals(0, $retval, "Example $fn exited with status $retval");
-		return $outp;
-	}
-	
-	protected function requireGraphicsLibrary() {
-		if(!EscposImage::isGdLoaded() && !EscposImage::isImagickLoaded()) {
-			$this -> markTestSkipped("This test requires a graphics library.");
-		}
-	}
-}
diff --git a/htdocs/includes/escpos/test/integration/resources/output/barcode.bin b/htdocs/includes/escpos/test/integration/resources/output/barcode.bin
deleted file mode 100644
index 79a2daf803edde452d5e0e47aa7e2545bb108962..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2342
zcmbVOOK;Oa5N<#~apB0Rsx*}VrKNc|DSdDO$4wy|BBZnx*Nwd-t2$oGyJ=eG&og6h
z5^s}~7F9~u-kope`{uFU{<bqLZ|~MG_^pOSDxrmpo$cL?t^|$moSh#VJJ<f3y4z?T
zem*)rIjy^n*OxaOcS=h;Egs1U?mS!Gk$Q+5&zCmvF#5mz<ySoNdoFHySc!N%&_jsF
zBc6%?l2nG{KtrFUfeg8-I?i^x<TfA}vUGk*#6dI;MLdA=B$e@C54U-64WSqaT}6ux
zU&flp`U_ZecCI~}A7b}-9D?g+4isn!EDVcqz{XmRm=*zxqPw-=4q|T=oFT)EYI`l!
zK#mfIR990zvKd#hFs!&fLbvBzT=UFfB(0ZbiTsZL1!O@O288iywnmT>3uKkWF_~=6
z1i%v|qv<?p%M@1PVBHavt>qI-U>&ea$oDE>xBk=Xy3Jafe%B`J;d*>LHHzR~kC9YO
zOJ8`fzSoj#5cb<y3aEb@RE0?IgxH-tlHC6m%-Q;a`42+K<*ZOnyLBJOLGzS2T(MNJ
ze#F7d4i+UtHX9(58Yns9pb{Pk7G=7cDMFL)fXcDYQ+0qRSiqH~rq}XmV4&~ztJxaU
z(<@+M$D*}m_5Q=BO0`BtFU=Bd+P6Aoc~;B&dvK|E2uy*}EY&roWnw|>U$lQ;>}L>W
ziHYl6oUfw0V9IZJZ1{lulTSZ&;Gi2l<afYQ4m_qY8e#$<VInn3bn|Ijft3hWWQ%gb
z=+2$OBSwfhVb~caN+t?PnMWybx@Q@|@hK;iHwW`zw8_=10*ZZBWBnk6(OBX1=P=F%
za~6VSV&(==mN5sWiDxe90pJ_QyupdSN0U4hO5-Il7HWu)dcsjI)5s1>k_bmSU4phK
zfEDE7-@<VfEJeIr0}u81zBzxGr+iMc5bu)xd#ac(8N?Pr%${>i`Dr$Y?$tRCnfMO8
zp5N(!P{3}Oh%z}5y+pNbc|lOp6NCIgeVMHdy4%P`!BgO=`9N`vx{Q;ArvXzOK7zU%
z^<`vt!<6_?KGAjO_2LPGoTId0z+;|bduCrA#rt~NGUg`w&RhFU5ypqv9cr4|0lLlU
myC4{*<%Ub&1!=k2$p0TU_biE~{#W=!QNEb^?`U=9J^u^w*`<2`

diff --git a/htdocs/includes/escpos/test/integration/resources/output/bit-image.bin b/htdocs/includes/escpos/test/integration/resources/output/bit-image.bin
deleted file mode 100644
index 462eb1a0bf32bbe4bd68b8e9dc8304bc6559549b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9789
zcmeI2F>l*O6o4N~Km-iK^i~;FL=GL2p@BvZhRz)ebP9|X-K1KqB~%s#T524iFxjbN
zmdwphF^m3y{)0q7hm2K`Au8;Meed0)cvM`p2s#yahROTx9q-<~dptee>7(P5VRR9N
z(PjU9I*!88dH*cB2>VGCPLt7O77fD3quDT=4Wlp~529q}>(NZt(iOtf`24&-89WTX
zis#|QFrJSGVLTZ>3FjBl&d1a6lWvHQd`9iwe-Mto33b_7(w`1Trx#c@h_S~>JllC3
zC*R_;;gfitNcYLZot=B%bzmQ!!M{wZs8w`|A~y^CqF9<76veH{X;G|AE-)F4%@svf
z6)@)&yCgT*BVJVUZANu!3jGrYRDV^q_g-uan4hon52iuX(*kPjtsyn)cimf11|K=^
z@P1H}uZ~PUoUXnP41*soS63!CSF5$jt!=(}T9@BCb-sjJ`|T;Tl+j;s3|?V!22f)(
zwOPN792oUmTYLcEn(~7T_Dnv?p;_Y|^pw$Fx9Q}u;c#lthhI(pdFA?s177u@<(a$>
z9nWyU^)BQ!Zn&9eIOH1V%dOrBBpg7+IJ*E&<#58A3H8VoonkWppI!4E-V7k%cdvSb
z6mz;!I2B%Cvy{>WUDZZmol&KNPRT2(Mw;hz3rY_y`C1efOZhKFVX>tDyC~?tq{qQ~
zBOF|poN-2Jc5lSu>WYiqw=#fKvs3bw?$=q%0M?>M$!|sPwH~)qaw`0%ELExEitdfD
z+GagK@AZQ90ky@!bMDxClWV!KUojiRe<gDN`JEiR%JlOhuQ=fP8}<S=VDOvN2hHm5
zxZ!bq^;$O%>KDy_2zOSRW%$tRrX<l;z|67VWft?I%l~Aule;gNSxa;i;X_5G0F7fU
zp9UH8ZqMVE7T!YGrzf!)tw6IA{FotU{5k+M4^t<{X2H=NG=p0}_HZe|Y5*O4EqVZ5
z<eb@C5aXPt3ue6Zz{R|t_YQK09+wen-rM3`Wb6o&mN$u6fe>>|`~zUU!C<yy4<#*@
zYr7NgF}oXiV~bs8JwU4OX4F1#|HMv4`oNSfIbZJN!!0>CqU&>(9&$6hIJ*4?W<6r*
zkBq{z<nyR;D$!_I25sRbE=R<dno(i)J!c_IpPwkkHpyyOS#z5#MoAd;Y?VwlU7{^B
zyi<K-Cr6E_9j90-ytB$F8iN+l4|(cQm}cPO4gYEGFtY&C-^rwH^Z*hdV|SDk9MLV;
zX2fQS74a0c*Gc=&5vw9ac+<09vAAhfz_~}!*?inj!jt)Bcz+YdJ<t)BV<RjvS3n-X
zX4eJp#pnfP;^*sZBP?E~#J+e_2Dgz-hi+~00lr73+(uYvAYRk(j;6zvia4ViCdF(c
zEQzRWge7iaBP<(XHOUujgoQ@<Zz8NOM}z3@@ah8_Ug>oQqj5|&yb^2Rw+y?1WjC-?
z`9_o*R`gYpQpwlCb^}Y>#cp7|AVb&<EW3e4pQq>w__dkCx&QG7)=7UnzB{~fZFr^E
zMH^n(^Fez)XwL@~f5WQI3w8Wx&j)3dwC95uEKs;$&j;=Kpu7|Cc|SSR+gGCr{;VrW
ZqSG1v3@e_-$!vr_%c`9j-uvQH_b;K8L%;w4

diff --git a/htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin b/htdocs/includes/escpos/test/integration/resources/output/character-encodings.bin
deleted file mode 100644
index 0a762c8c160e39da6be9fc7c587b76a53e73c74e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1780
zcmZuyTWl0n7zTZ-F;NqrHYQ&a6ELYh_(Xg`2<0M;K_p^)J3DiB=X7W0tmn*ZFHiIa
zR0;;u2!aW1xoo-1r9iotise>dmtH}zh0+Txkg&LkVxs@<wp<eDVP?*pbH4xkzyCY`
z1U?Pq&syX}ZSHW_<0fq8hJ6<1IxmnvEl@ap9&?4ZKFJFdPW!?a<tDd1npG}`jtcE@
z6ia0W*DE-*Ib;XC*EXBHfJUx{AymZI5nIMw?qa#LJ&UW%KHKIdM|34h%WN5v?neYa
zeF0YvbF-1=Gg})L*Vq)KjWOxsYg!n!r0e)vMDVR&ZF?vt5Eo%pKgbomd{e?zIESP-
zk7R)Y-W#XxObp$5uzBEbJQ^H9`pMI=)ZM1>9`xS6bN@--@RpuT>_RtePo=rc;uJs_
z5d@ViaS@WGDE6JGhKvz?%7H{GFM}y_(Y}nnkf_i`RJh>^;Yuv$uEDj<BrH)b5fLQL
zv?hmpN@@gIu>>!*n6Et%W3X*MCK$>PQjM|zY@1Xp$iSd|BEyw1B@AX*QYo3uaXzJN
z<mytyVFbLle)bj2u@N5*6B_o6yADZg``%LzE_)oKq7+I0Uk&wu;*tD@Vo~;wM=6nb
z26N>&m`@Y-0Npem*<2SOszx<T!W^=-r_v7OUnI*jo6G`Q09VF_vwRjQ(hmz5w}p|F
ze%_3b<uh$CVWU%OR)Cwzv6w+*VBHX5l5s9)uFC`|N`X=e7a1{QVPB)ow3u+LEb>C%
z4KpPstw9EBQL)ByFW|lNOs#=e5vf<9t*R+p8O;$fIC<EdWU-huU+)OGv~L3Sr2<x^
zLRo~Yi;?1{knh0Vis1U|0<lILGK>aO@hHne6)}&BlC$Ijs$PCoU-ww=1cT}wtLqjp
z%WIYIR3RaFv>0=l#SoEHbmfKYx*9(2BUVKRAd9s`J~!AB!*Z{$LJ7PiRyUd3$;jKt
z0e%p2qXQjL<z*uXiJZHZ`dUwM2zYN-Vx(cL;XWR1ZNQG^-Dn)gaP!@PdxNu4-B5tN
z`!Lk7dt$V?X?!Oh?uu{Uvw!#Ff&7fcm-&ja&N*g@C}s}J9M*1FOnX$EG8XXOjIS-n
z78$Bn9IIH+H&_JWiWny~vpIZ5hH<&(n7NpFEW$FCWOnGo5@CAQ2a^YG`oUY5e!JTF
zE86-x`gh>>BRywtp24{b=X(=*hYntBIo5Rztyhj8ZpVQWN4t~PPvY?98>dg*&ZCAi
zYq?Yr4dIgSWLR-M)rFRk9We8AIs+C{%*dJ6kS3XzJR@utwD}Z)cUzO^E+yhS&L$2W
zn83i*`01{riN=c)rxK%aoa`SPI5?Wz-7^|*>+VeM>OMViVx)C@Yg6*v){etC(%;x}
zqrIc~#Qv`1iI%R$WP5Ys_?fZJ_=V(o{E}=vpJ;4NUZL;X`VL**+ZErLXldWIFNr<L
z)=O>4V_g}cU#PTDC>AD_a?EDGbmigY!AtM6^IjRe0{2|>kZ;>Bi$1v}hdGIydrYCd
zGBta0NrvnkYBR#X%%#hU=q!8GZlY1C=todMU4aCqW(J|P&-IkNA9ts3<7#T~PKxfs
z*V6bSbuWE+FpZAEuGGC7X`D}A$Awffbt`oV8}KmI**`&ZJ*g`XZ~lo3>H8fRN?jT3
zXiMQ<`et88BAwx}kOvhn`ClHkpq~xRk{MrR@_tn%)^FJOJ$_n^irTeUx1wgv$_muf
j)o=O%>wa8;x*Dvi*jSAfwcnw7LtX9a>b&>9n)CX9MQ`KH

diff --git a/htdocs/includes/escpos/test/integration/resources/output/character-tables.bin b/htdocs/includes/escpos/test/integration/resources/output/character-tables.bin
deleted file mode 100644
index f3fb990cea3c56a9631360b2d12cb0e5b64254c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8174
zcmdT}Rdf?k5N#=TaJL*_3)C%}WF<x05U2nxZ7EJErO-kJ3B@_MySux)ySux)yKBpP
zoAeEbulGBj$(g(7-g!H7=gsPB>1<g#o0HD!924IrB~j1^3YJKdQOT#X(mw@3FB*&{
zNmf*IP_U)8wa)*)9f1ac00h@cm8-b9dw6<z`}q3#2S99K)oRsi)FiRaCK_1F{;awo
zp<&_m>NkjpY#0?C(<rualcvp@w`kcajt0s!uyuT!gtm$8+9xG<=$Mk4mfopzm#(&M
z8QpvI?A5zZ-+lrORB2%U0RsmO9x`;;@DU?NjUF?0-1rF-CrzF*b=ve9GiS}7Gj|>h
z45ESa7c5+~c*)Xb%U7&iwR+9kb?Y~5+_ZVi)@|E&?A*0`&)$7B&_V<EA2@jE@R6g(
zj-NPr>hzhj=gwcac<J($tJkjIxOwaLoxAsFpp^#RfAH|p<0ns_J%91?)$2EJ-@X6v
z@zduoU%!3-@$=X3KbeFhO|dfxx2IU7DK;Ao<N;3PPaO1fF!}~cUzPNz=({lbMvcCV
zi+)Z<-(;t6M3wzqjJ{;2FQKBJo6(m81;H~d-6o{Q+Y*uz+X}XHAvqyEEkm%;?&+n;
zqSc;<K@?s{UItNlA^90Z)S8MaiKr4=0Qi%x!k5{CfU%ddl<ieG8fhWmuhp``ycP%l
z!oZ&tb7*u#oT^G@KU{}U1VoUMwnT~s36~ug1p%bN5I>e>RFz*0_>*o&=LuZ-FAn_8
zyq&8A!x+ev&DZTp0><9q6%(p+E(QF#JA7%tkPgq6r!s&cU6l`07BHlf@nOmVhI<yM
zz%WMcbFT;(a_)TG$X&#7!!UB^+7&RGn<@&f(X0~iw@=0rF8-B)zhgAUHNjN@{+f}h
zGOj-E2K*g9imSi61An`Z%4Ssl-~s%JkFseJ*GuHdM3_i}XCg#gt;h>ha9fTyV6?T6
zf^0nT0sapA!}aF*0)Nf^L~@ZqRsVh<K=VJsAJ=Bi9|UCIByl--00__=kemRn<)R)0
zXckBW;PP-01P~9@mJzs$*uVrx+UFy30=TvjMi8LgvWWm(`z#X((0rH(P*M4S1OkW=
zM}>=e6D|S4On}V27_b0_`zt|hz;J&iumXmASyhK&6z-)(UBGZpkRgEKURs0#hI>I2
l1{m%IQ8-|@7erAEqjKxXWEf&yyxX3ve?UC!%Etz|`~{yY7?A(~

diff --git a/htdocs/includes/escpos/test/integration/resources/output/demo.bin b/htdocs/includes/escpos/test/integration/resources/output/demo.bin
deleted file mode 100644
index 6b426d91ff0563a2ec43c93217f26a492e8d9396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73643
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

diff --git a/htdocs/includes/escpos/test/integration/resources/output/graphics.bin b/htdocs/includes/escpos/test/integration/resources/output/graphics.bin
deleted file mode 100644
index 8eeda76d297b88770222784da5f19cd8fe3f0af1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9635
zcmeI1F>l;96vrPe;Dj26m91y=a=fuqaP4%%;pnbKrXpz9Gg2ckVB`*m1n|&W>eMky
z=jNkWMLs~jK_Z|-#$J&jD(sy4e~*+zDJfb6om$ec$R8g?Jw85C@2F3XZ-09C%a5k(
zsZyVPPe0K=Os48IR8^Jx6-iZXeb!ZV<8xY7JD)2gkI`LKWo?CU-g3lpk7MSdmG>Fy
zbQJnK*4(~q`}-jF1}yh?`3K)1=1D~zj(3!L?HADv8IR}c9loVI@^bF;Y+Zh*J%i7-
z<)zQVvfTMR>htxJuKY%I`GPwAkJmIZ-t+V^#g)$)QHNn_zx^1jz4oIX9}z{q{3xSC
zpXWIZJG`W&@%mc~Rlf2Z&KxH6+~;4)DDfQda!I4u=UX(5JqO$!P~PD|l*OJy?l50b
zyCOgsK+Bk2BGo#a<7Pr*c12Y+14zU*-{EEeTGn2>f{bw5D4aSj&@HF5;HzmAwgpow
zsA?{`8Ec+%rfUza`N}EmES0=;3Oh?Czc~eymwY?LZyf8ZnlmXF%h9#7xVe<-=&c(-
zYFX8MX`ichZU8%{N6l}Y-a9*PRdee254TmNMjA%fj!mEK0OQw%=tHK*`l&oPev@0d
z<D_LVNb<_blc(=x{VKEfJ9*1m+BY0)F`)j{wI|EwuXqqkd-K|MPv)8B-yKg&%Wn9z
zT%;_qRzTr6SqMAx!sUPVS>@3SVbKz9;&^7bmS}Kn<!hY@A1q_(sfY{53EzostOCQS
z{xJh*vK)wpvsC5imXv+KP~Q+Z##Vx6L{lt_CD8($3&#aB<}@vYaamG?vYq!Sc*?iC
z5n4X%@c|eQLbCE9vnVh@X^1}}(VILLJ1!v^iQL+q`A|4&<bxhZ!ghe%KFYX%lIJt4
zjP;>4Uvjy;muEe>bYj~}k#CAJT$Js9fMU$-p2tR!SxRKom`WH8bu@Oo#dgGeVHpaG
z@2SEuzds>HpKLWWwmfEwadHejM>Vrex3Fb~oZEv{4vn}URc#G&Q8|S%cmw@drXIpH
zqX-%PdG1gsi1k;Q>l+@x0x%xO$<Um$+?o;HR3-Bo+S_FPXD+I^Dr9!nTXt^RR!9lq
z)E-Sg|LXL?<MWfv<lf_pJNx@}jI|eHtj1iLeLxIvt3HU~2X&JByBuOH*{Ga-kr|K2
zVBe)jJwC!p^5r4Mf`MdLLk`nnuVT(PLo&i4#&R)Lh_ReogcvKtSVQ)O5M#jz|7wi&
z&Dpo7y#Pz?g+na6@!$=G_$mZgwKecdBOGFdLo8FTi2Bfqe@=3$`O0xP#Ikk?hgdJz
z5aAFj9AfeN6s~|D&Jxi5_Ybk|ot&Td0<66dVA*{USIrI)POut#ga9jiCB#=mw<79*
zDg;;(Q8r%<!&gEHsOqEW@RcxpCH&uhCA@pGc_2qvle34D`>W07^!}sCdb3)uHjmC$
M5AW>X{`!mPPivkA#sB~S

diff --git a/htdocs/includes/escpos/test/integration/resources/output/interface.bin b/htdocs/includes/escpos/test/integration/resources/output/interface.bin
deleted file mode 100644
index 729d4f4481b..00000000000
--- a/htdocs/includes/escpos/test/integration/resources/output/interface.bin
+++ /dev/null
@@ -1,2 +0,0 @@
-@Hello World!
-VA
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z b/htdocs/includes/escpos/test/integration/resources/output/print-from-pdf.bin.z
deleted file mode 100644
index f89eb5d2115e388de90586ff30d80a47fc0ad083..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17081
zcmc$_bx>SSw=VpPL6G2*1Q-&W!9s8tAh`PsgA*WFaCZnU!C`Rs8QdL$2Y0vNFgSzj
z&HJA7)pt*wy8oQIRd@fft5;XA-nF`WKWnY0yImI!TYYTF=Dq&hq(nHXjc}w)<k>5+
zchk|1u<6fOhudQ`tm93Ef2QVFTXA)^D6T_(FaGFis^jFq-LO<u6!I+P1t81LHji1!
zIhmYgKGNmtY}S2relZ!9R>)q8x1l9Dw1qf|t!3u&OH+0+mQ!#Tw1jE>YMp)a<Db{j
z|2&J@I=vE$`RcFlc|P`V>$SS?y?i}4RavNayU{|R#>>hpWSb`S&%dAc=z#YLLHO%K
zFElpKFb|dRuUuf>Sg<}!okp>}=%zw+I5maG`vfvUEgz814j|8)nI4%f^Nm_Szv>u+
zAXZ*mFP(9oun-#yp5|1@p_KKb@Hb!0fUc^8uQakqGDoAIq45`!FNj4ctb1?4TERcK
zE!^$%l+hn)+3|k9ZT1Qgs;O$}r{4NgGX;P+IDjw0eTqv0s)rBOxuE&1aX3Z&@w1em
z2~*TUpwv`9jeYc?dncEYTVHOyPOV`adb0TDjLI)2T!g#htbg-KQNYgU*H_4Q;C_@&
zP}j<34uHJa_4AY%|5eha1QMeG;3xfzX(+b|kj;T>sua(2?n=JAb+pQ+r|^5QiPLCs
zul^^ri!h;UzQx!DoKdi_e5QE<uDsh6`E&CH<ZywdUJu}T16;9j-7()X-4Zd&TAA~g
zD!Tgf!u4KdIr;T+oON!pb{ru}iYHx7lZ<cTtnM`OGrOrX68~77ME_$97>`lHo<ZU~
z@p%tkeNjo^8RHhQF+wfsWWPhA3-$K;la)BfCUGZAWXbprk-r&*$BE20JRXI&*X%2(
z6X|?od0?-UN__?f5?}FzCS+gm(HQ_8{}WTEob0|yF<P9BC}eg#>Htl^gJ+5SeKP3V
zgJh;k+#M?|aO*d+AL0=^iOr{GoOT70@L-OY>xKL1rzuElwug$DN~x>|z-<cQP<1p_
zQW<41$;d?!wfpo&7C{(lFvU`q?yRq8E6`8#I3_lMFp~cIv%AI=C;btYk|ivfnoY@)
zU(vNdEA!^FzTyNMhe5E_CR^d^aAN859aOAoE%3Xklj#!yPj^iR$k@XhAhYGjr(bt<
z`nnX<@A$c1`M1{0{nE?WZbxpLVai|Br{)Se47&+jBB}DBqsBbLp<W;=>#ctCoZkKO
zX;hh%&7Qe*Zp$ny%A~b0jY($8p@Up82}8KH?))H?Ew4(Y%(YWp3BXdh<|bZ9ic0~v
zYS=e@d$GIbuyQF%XemfJMolNdTK`pf)RXxaGOBJK@py1NFHIkjQ)$e931S&VyWowu
zm_PX4mDp3YcBqdLd`P-rvhmmh>GQZ<c?ckY7Tn!gHMI|tEUwlL8+JX8xa_K!ky3T<
zME@qacPts%szr;s`a_1yTUGV?HY`lBRe$o;xSY!APs~}Wk4n|fR@G@_Nw$aQBMIi}
zHn+{`&9L@_pWv*W+spOM=b62-m%SxHCLFRck!q@WAxb#!g2Ov5A_ax)mw&M-D}_bY
zQ6&<+i1|&$js`a!<Bdno`Bz$h%|>c|9E!^}nvBXWsq4+>A09juynP0;+fKd!8H_qi
z4X~Em<sX4ul1vGvJ){|$n|jTc-DZ+ZUrx8PiB>V`x=ByxevWEx{oMUwbnIA%6p+0w
zQ<5#+dyyC7n~CwR#?rm-LCnaZ+V!Hv)yjg}6Wwa-Ov1`=aE`eEOT9m{egpk2DZ|eD
z#ETb^Y*XHDQ;)8Ovv(U9JgoL4;Y^ewN?e(;0zT*UCq*1}9C4dNItH3-(u^vyWJSh8
zTP~4sOcu~~_{PxY^{~!bik^nv;?~;TR`#kti=fUdU}B=nWh?vUT-`O+S&=YqRO`xh
z5YxhbpvsiK$B?~oLc;B(Y94jIZ;}X3pov;Alqw|_r!*+Do8ETjsB<It@Y6+w3agbe
zW!F?3Rq`JUPd{;1r?n1Fp0ObMq;9bq-yJ)3wO4+`87Bu7W-b|g+xU|1mtz+#$wZP?
zNIRXV+yD%=o#u-WX>7Wi9cU3c`{=lnaY91y{!ACOubcF6oJx+a$L^(jh8wTHctR5W
zw)=Bk_m@aF75sSe#Jt7y$()pR_fJvHr(>R4I+0BG+N8CCsoFtXpyEmPqvad5J<rOo
z&PVXH^!a*<yRU*pN*OUyC7?eyUqPz-vp<*JU6-23VJ{dcTM8?sX73%LfC)3&WjEIi
z3Puas=R0vTphK;dm<0N6!;kGFHf4)DaSjC>^J}Nmzu%lar%()E&05y;?GE&Xn$bbX
zeTFn4;nTm@8%IFANmQmqQku{*YD&JoJ8Vxw<;F<Z{(+7q58#y#XFrI)QzIXc!Wa@s
ze9IP=dqlE7V#JQ?0`KRTO_o|HakcK=7F3$QxHf9qaOc+<O)7S^Z_0EV(?^y`O;zug
zNgYgx)vLGm1y{YB?Q%K5Sj)A1$RaY_(J|s5&U4)Q6y=+{fTEb8WR-Xs+cgl>x|!hs
zfuzU~>sIM1iF>H*S*A7Detb96<HANnA!WRyBh_ixmQ>#zJhN<jn{wC<JL-M)-1@hW
zW2L>GNs$1q_4ywFs3^a1@H8?r3*OrkW|}7uWp<>M7JT|OIHM$V4jS$qxa1Jy-NX}y
zerii%sPAxY@%&Y^yjo%W(Sngi%kVhcH|k*P-cJ|5wOjzsj((%_IbD-%W!*64ceFJD
zfSInIRzXijgP`>9M~1MNRolE+>GnBuKv@awB0$mT^7Mm$Kt*|n8tdTkz}D8{p8c&}
zRoe1MVkx@%1}K??LeYr!hu1XiC?U?^Y?-e1%G?~oc35EPaOv>f<%1x|y8T15pJ0^M
zMf_$gIAOq$PggM^!oJROf{jUKCx)Kx1-tiTQ}AX!G_JsC{7stfsS(XB%VH&+go~g+
zY<0Ce$s8sy6{C8^AKjdl7$?|d@8mN0xQB{KC&c|FsQc$eA{CQT6MBQ2c1`PW;L@-J
z&sz%heS5DvQ2aMQXHb2%1E-j6-a3AyURV|QID>DUrT&)poJq00vjo%pO-2{iyI0gm
zgVL7HZQ1cdT4|CCGshG0q~J-W<{t8877Zsrfk2SP{$*pvA8Vyh*Ddy9K;AgFb(nP<
z{=xuGw#a6#{)^hUOY3|xW59?Bpz*5&g_ip=3QqtT5IV6|w&8wFTo1|-MeT&`8@%ZG
zLNx4*T&pVU^U!~e!b5hH1)FS{?Esou?}rF2F3Ft)=>^VrOCCQ(QGFE&H7ldvbbpTD
z)MFxGNm|ozP15e>@Ds;oGO(VG{D{tG-0PhT+2{h{2>jfI|01jHSGLrkL!MH`KhOUi
z`&_>YjtIUoY`B=LWtVd*(obd#UvzsJ_+T~5HC5|S_HdRZ8RcSMXD!X4ycdgUb$$rS
z+Zz?l#}?g(VoDFaLeZuU4iArR0+L!-jMxi*`+hQo?a<0dMS2d^(C0<G8Bf;5zfe8U
z`$F=wPrk5UEJs_G^#``6F8g!G3WEOVBI51<EQ!R(0=)XSnkkLvm~Lxk1n5@!LiysK
zMLau&n-@0Ug*^h<D|WKQNbLDJh$svJ+$hHgcSTdbMC`NY4;Ck}Y^tY!;u`vM(};AU
zvN&+*Zky~0#-%phT=UA&xy103q{LK2RAz}gkJl=ZAi@Yh^*G1)0`)?fY1;_(<dw0M
zs=;XPoUz1fjwp?<fMhpymqheNfKPhxC?3Cw0;As!#%>J=baB0WcEWV-QasL~jC$<^
zVC@=Vn*}xeYif)DQwO2$fV4BvK?BG8<x?}wCa?3cNcz}!y7|Y&{nXJ6$8HHrhXBJ1
z^z;*u<L02bqX0UX3U8KBGbe-a9g>mj=$Mu<u~oliz-E5L_7q9(!$F>4&;QV|?1;-q
zO%L+yz>({fth=UA3%3#owbf{G*%xgbe&#!)gj>re8PM>}2LxJ$p<ncKOw7c6e|WBP
zTmxFM#2yLKxkSltWpSs5x9#^YbP!cLD~#z(IyDHe>v^qn^5i0ln!t&s>|rw_q0zl^
z4&Io6VdxHAkZ-DniQy=l$+~Z2ajT;gG+>SUX3YhpK!G9DOk>f~Um#)3@{KrwZp#D9
zkx?k|`iR}Z-m}A1N)HycZgLcF5Ew?6oap4?{PxXYM5<^=-X{Xd`I;iG&T%3;oY9iX
z+#mZL<m%X(gDc9P4`j8eqi4<h<%ASSJLy%_ZVh*o;5#o<Nu1K_ehrEFgqn%ePb(3y
zq#|5*<AzYr`GWoN7tHF<8YYux*il6qnuT&@JG-5jfBj%i-ZuVko2o7ti=d%>ABW4Q
zs2UkT&yG`&A`O@3Y5aog`cT{$!SL2v5&AIIs6Q2B<@)%7>(QsEF!0iVgMDAu@rLGN
z*9Hm{;FeJcP(6Ja7vOHFkO8&Diuxjmu#x=vT|~>LMj9z0&!h@gThfDdfH-$ZZ7uu6
zn0!SAv=lDfn$x%?Cf(F2Sv7XETPY~plq+^s??vtA!<Ejo$<CTpsjmKFIkQ{}`^HXw
zi6EPW{m(dcYO55wC1bT2He6(!DY8%p@UCihw4-5$KPi|KN+{vg4H9f;V=JZ{>ROD`
zkj<RRKP(|Gc%k);$;7<(Q}abdWtQQ+II-xB@;IfoL@_4Cb_?nLN?bR!<c~-j>Y*f&
zce9fhskwX~b0z0_HH`t`X1T0my*H-&G0eAZ2UP0ho1dZ#C@MgXf)dbeJKJ<^(~PtU
z|6uvGuR(*KMi-ueWSo64XLFBT{j};A1-p?^f7}QDIx`$<$HO(7-Y)xvioDR_)KF~)
zm+|FbXY+=Wx*0LGJfvB<m?A~4uwe!gbfqVF`aKiBisav5^9721Oj^;GtjAY6E9vJa
z@V>j&*RXc6VgFZX)171RuWTVVXA_*G`S$Z^x22nsVL%%PZW)Rb@U6^M+~Hc|<HIka
z3j%1Bsr4&@Rf)@lQ$;f&PqOS2AjSD@sm$KOVyY&(6-jJwnA+S(!aM~_%7DX!a2$5G
z=MB-ot9UA$?dV(aO|%<MMze#F7Z%ipzdyXY(MH==uM*vSH2gN6mz!!>O&^OvSGoQ(
z50C6_%tzXdF^P(;0!vdDmjXKuI~xGV?CRhtlHx)$*O0@tALW^Gd%4}Oic1j5TJklg
zL}k?G&sPEo&gl<%FL3*(-0a_9=#;vOdbkplNik2kCGe=x=$*c$yI?lei4x0GK+2?+
zf`BFfA6+-0utuUrwbNa8q^5?8Aj1znq^9bkhi$cKDN?0Ks@T<g`Qn?iTeq(|pmN0_
z-91)}cob_Yw=tvlu&2;9&o$$>>M-@|4EnCRyNjeR;ayWkFL_xQZL!MGdEBFilh3Bb
zPmyVF7q`Qplq9RI%2R09r4iRRp`}hliaw@`@pS9<x6NHQ&ASGyjmAPX^+p)ZQa>ZL
zY4ji7<pOpS|Aj1b^=Bvio262iLWPhx<H-lch2@<F1@+<Y)7?~46F(DQ%zL2)%)Hxu
zftrGBar2NJPKY(3uEpkSPRB5R@+U}Ge71EUSjLhMy3YS(DnXjoIl-u_gY&_HpufLU
ztQf>*LILj)qK`f>^kyXb2=r!_z&3v%PZ>_5uHoAhjiG7QFAbYTYlP9q#A2`p=Exmz
zrmQT8`BRGlh0>^G?kD&b;@$uLw9&hGQA!`S2!_pLrj&`IYA($<HK0TbH9n5M%YsRD
zZ9`q#T<lSzRQem{Smm*~L%H{K>eDzNhbfNP&2fRVJXD61vtZm5$6gy-^LmUzx=ZJs
zM*?u`or@sVMaW-eDYq>Vx+s&Yt8c)JtbK!Jw3Umg71F{phK1xlu$ig?g@WNd=mMmF
ztkVCZ6U4r5&9+5cg0vC@8UPHx-cwz)Xq<wPQBk&9@y5E_AIHBG-*&C8u#Q;E2ha+7
z4ppq%^G4PUoboOtG*HH)Myl(}_tuv&Hq$0H9Sw{OEyM;^V9g^R-`1v@Jj)n(ZAPFv
zH>y@QO;&~Qc(w6Z_^fkggh90w2RPl7O{;(N@nBi0%h%gA2=8*%d->hw438E>$(Y;T
zVpmzS=%Fdfbatgv8&!xsiOCjtz}so~BT`brh*8KF^J#M8;8SdM0>5xubm|7Q#N!bf
z=g`$R6tMZ^nWQwzRTmtr<|~j}BST;O*D)64N^=)p6B9LNVrGgTd3`q?*4R2K7oQO3
zR9Ct+>K#9)=%h{Eo&=EmW}?@)ONP76rAMf2Mu5lC4~XzXB&8aBz8HzB3>`HTmI#Un
zD$E|EKyHD3^F$rQxQAB_8G-Qx261jVpzMtgxBM`L7y~0^V+FH4H!jVc?By1J_ncS3
z?&PClvmCm@#<OunSG>p+onMyBWY!xhrYhV{j?1WBcH!o@ihUK8boBAFlcWd=;_QeW
z8dSvvvvQOl?)oX}`Ax|V#`htI*1yq-XpdOExd$#;h_`c)v#yTP4|l_VQ6;ZlX+GEq
zI)YOSk5jENCOW&cN4o3w0^)egQ?RwEC?Y0&k+w-5U#&+67i<kCo#}24i(B?+@*GbQ
zo=!*WXT7z?m97_AT|%`=U45BSO7vaINnh{R40E<(Hn2<_^dhH${k`5B0@;@W&C?2M
zk4-vcrSDr^8x%p*dO#BA&u7+A&HLB~ho^LO)x~0$XW--MxlU?arS;^cB{3$UK2q+0
zFKHZyZYfbv8AnD>vi_!0#Yi^leoBJ+7Y6Ojdsp`#jjlF*4jiH`Bt!@J3m;T4nLJM>
zoKm7VN(5Od`U?>spJF6~<!fkJFr)Ivm?=iCohhpD(BjI1al(|<HM_!W&;Qk07uU-Z
zw^-(kC0*gWqM`pKnudeTwR7#q&g@qym9J_?a`!l+3`cXzFk%9U^S9SPqepci!Yvzo
zJ8ts(e=<TSn6n)WkoZ;}LgSkl`)gb_55F^{mTJ8l%9}HGWtGL+v&TRTSwAurR;?It
zRhPoK*up&k?F%Df&L9o5on!*P4D@5`V${*4z2LLiuC@3uLoVD%8ky<b<F)ZOqhf0O
zAE&w;d}+DU=TI*-A3g>s>=b0!BU(*?008UU=n8pcuE^eHbJvpBVhq>KazLwKWj^lC
z@#3kBOk#Md=cD!dCG?HgV1w>RkCtgVjyBLK^I!@t<<kwi@v3quoc*WgW3pG0GJt(_
zrEA7|_u)g-YE>VLfR2W$2kP}V$m0w!G;df>@ZA|p0!YgJ{Hy#@?^{72Aecds5=5y>
z-*MsX`k5wa&wt0PCl~Y{Fy17vw*<>rzE+Rg+M5L28eB-f|BsOTKS;^{$y-R7w>1$e
zw^EqH@cNBBpP;MjF(I4bYYes4rHv#P;jq7sG2J1q)%E3-LL;D!el*WaYl?$$ztt@R
zdlOpJw_6LMmnKqEQaus6+xWHk(?xJe6jA6wgu0AGzgibr`|>xO@)vY7q1Cd{8C6!w
z*!`e?8h*b0u`JlS9KHfNE7+dSv}e0(_WnNa+&~Z}r`1>=gdX?E`E?T?^)mj^m4@Qk
zzpdi5KY%BqMW11NUH|`FZ1BZ@v!2r4)$4c*)4pqp#c6hx{ktcHNU5M-c{!l02~>lk
zANCj<2X}eCMV=NsTx+?0-w}^r&~HeQvSIKa!Q3LQUGd*OyX=PRbZDeVIIpGiR&6<U
zq{U4J(JsGU#`-P!D6(>?9oHxSw0-+cnmgR3Q##Klw$^<#`t1G>6Ae&Y)!;~VGpN&u
z)&W#k#=OmS_B`}k{FUKxk0blHYoq6O*f}K<)_4K>AF7js&ah)PvqW-ulQ314WZ!+w
z_$sRz4i-F@Bb6p#dfu2pGvNMd%bn^CVEne|2ey5zJCR~8Ktve>vj9vqzKb>O1cB}*
z+B$yBea+ikk>d`??x)7SaRHh10nF>A@RXC&;<?o@tC#@Z)p=nzVSN?Y#Vgg7GJ@+`
z)##zmC(PY=kr-f*p|aY;^x0;-j?rIP#3e=WMSIIe2l3zVwE?NAHlyXLH^0S~R*=Df
zvModJdp<>&n}Mf|0r|^#RmrTop}BZSV&_fVc7YDO#&7*!HGPK%e^MGl;rY8c`oEkl
zlA^Tq*0(pOvkBg^>{!UyITD_GyRG5n&BR)0l<;jyJ|Gy&M%U9qF(m|dG&EHmB&0L9
z5bbzdSejO6VPhp=BWtxp2Ps$xcq#!EDFI3quD=OH>9&6`k1hkeDM`N^KekE<BGRfy
z53#CCR?f6C<KlM|H<pXo*{+6vXISGuC->U^nz4N#72n&k+s0h{X2w*i%mWvC8ttxB
zjDhi}#@}8`)Iw{%KBM}2m|nJkuv$fQ9c9AqQt~y>#zEbgG5i1}cP7X}G(*E~TBjlW
zOpP~9HC&8;7!<(mB>PQ8Q=)f#3WL`A+LTjOI)>Rw2HH1!60S(KFg}DTo#9Z?9nIRo
z*HJ=yH?Tmsnda;NK9spBBfKhzcw1#=(N%*mbJ|f<5Tq2(p!z8hJhQ70QbOavy##3@
z*P2f^RS!XA9&QQyf;frTWD?CC8(_h;w8~)9+7UvX!YvVf@e6=;t2zKY*Hx{0-2Z9R
zhTHwKK!%w`RHi%jy4&t$*!Qx&`i+kf86Dh!4%8G9_ack@bXZ*w?ydx;_AgyYypQbB
zUR3P237c^y=ZkB%5g5^RwBt*xKl};ZDG6mUvS@AzKhk5+Z~fYvIh`L-GVhE&N#<PT
zkNS9FTjHDH54zap2*39_eJ!YKbcXdOMnVo}DUESn&>bKb^ZTqR7VCVMFO8~@gN+gG
zXuK=GqAik=B5H|#)HM^-(dH)2-34+V&5))9ok8C)G5@q7El0lopTO7uEu9~k(0}6~
z_g%mCf8yYfHx6Dv036H)Xy4D~en#tY`ua8F>;E$d=8D7<jeSvC{Amj4WXaookL)mN
z1_Zj<vH^&2h{!oR|34foNHQ&=S8|NDrjKxwbVuO<>_T!EEf73WE$~yEV&N^lOP7bK
zszYTZor!@~E>O~W;WO%}B>JrLKI*;y7^AEhBc)c(AMvJ<4;z#BeFeLIx8Ve8XlQ<v
zTdejK&O$>pdWB?jQs{aJ0l#`@DS3;dt{*(tW30!KZ!N>ew8WR#iBRn>kLoNs9`^f5
z8SS+K>r6{iW9u*`eZWt0pS`fl+rAt7H-!Y1S-oZYja4$#kIy1pzq@q9CdCr_%5*fp
zMp859Scm+XMm-6bFOaRWjS#gpJp>9r3Rm&CNPx$XK>{q)$VjIehpbHJZagxV{UZ%U
ztBtQOG;At(>?=a9uj|Y6A8#U78`;^t1+Kc)Sg10*kG7QFcp^C_CrvXw+z*t*obah(
zAxc6|&~^^n%fV5FKC|w2vhVn(Qw~xiZ9-nxL+3;h*O}UUBT>Q{B*Hs9K1A=II($H*
z106f|WPD;z_w-%USE_uNc0mxctABb-^_%TBh%fH@)skfcb_It%ZUUCpyfXW)YoW@V
z*T)=IGff&gedP}`l8!Z20l2L}`fAf!FX5$Q3%;?ldd;V9T9M;6rU<56>D(?aHogZ`
z?(sS|K5V*_D!)poQ~P)&39qku<Y1zBWB;!;w~40u8AAJas2C>w+aW`wba4pNqz@Mb
z>fwgotox$4i>2;R4JveTb{@a;_Kru4g=!?Y{p63-M(0DhkI&^~<4J@w*G+vZy8d0$
zqsNN>lWBugB}<>=()Wv3psP6!)Ap+ep0?|5)8a)5hp4Ua>lTV&>&Cvv`sybeDE>~=
z{A2RXJaILzMPhkfm@9H%wt<b(XYW*Hm8|_CMyWRPI>Gg3l1)$m>2Wv5*1pQWK9M~L
z)q78I;dOi(g<Z$oS8gSna35Hn;xf4UFg~n~UjwtyGHRwqyNvka74pZq3a5T<A^VU>
zN<g{0KY!kat+?+DwKK}rCnnrd-R$j&bm4&N%|!Y<B+s@xZtYbHlP^)6dT_3{Pe)li
zonNrM${@cJYY|xIdw<$Y-B&wU?qeRpkLE0uc6)wv?0I|3zAWsqlIeOkgIlOIv)Ltd
z?8`-5N*&bdpV-A9xq6IVBgIHfO^x7}aD$(+wYQrqR8oXzrlwZwoC#YF)hp>V$)}<>
zDN^jL;U1~2Jl0LVwewU#QE_u~CzPvfo&+T7dmpgTJYCfvj-5)NdP%JV@G=z(C1hgn
zy?uT~xUMH>Q=58U4Domo{#-bJ`sAKq?dART3*O7j(Vf=BC}EEC(NT~yD*e~%h-=jP
z{Ibo_u`q|@)=*4kc|?THL;<Dn6xI5P)sz3uD(iAuT4VW>+2P8A|9KyHH}<&)9?G3G
zt$-&j?fT%$;nJ52l~lvw`bEDxG?fRqKMqxx#D1^EF<qjNm6s2ro&8$x&_Jv9(+}>j
z@;2n5z1jJ1SoP#j=!oYHM<!o)gqO{qlS05#e$>+?TZC>S=cPB-dY@@wd3DI7O^DGI
zI?mHbb^G~KIv=<5)<fk0!$x<^?5JW?We9vv%xK=X%e4Jbj*<^`JqIi71-9<Hp59xy
zIN<8(Hl;ox&y<dQ9(sL98yt?UudUgyB$}-cD(*@vNgjtrCVkWO3z7UM4iAg0&vg^A
z-rw0&Li0!!D@^y_5BPQ<=YI2S3U-WdA2_X!m>E5Vm|A0wZz9Lr??l=0aLP%Z7+f}{
zuZ|z9ufqDgug3@8-%ZVT@Q}8%Uk>-cY#s+-KCYV)g?iq%2dPHoPXj!UiPXe>$LT#!
z#;0V2t1WG3!%tz7<OuQmpEf!aW#S+g=dX6BWYnwVxslWY_%_}fXUeox_tc(3t?ng`
z8<*XEZ5;ZbOB=b+n<tCUP$B28^7>tV>{=b;3*F$cQR^r~MhV{nx1p^qRB)f)@ZN)L
zKDe<yLYVg=lp8<u_IiW5Mw|V!px}Z~XN$cH^Hb{{{i0M>`CpFrbZ@V4QC#P`BjWz5
z{wcNeY;mjnuu^p{+WR;zQ#HQ}`yYj&?=>*u=uznWMKFSbth8w`O7ZYLKX#MV)tK@Q
z{!RX3Z*0pW^$t}3p|pbg$%@_f?s!P}X%2TKJ?$a|KE6{>D5WRFdASXvw$W?*e6gL{
zCd_v}Dw*l2)9Se;r}zG?*Q3W|u1^n@=hGGw=eqvw<7Pyk)YIjBOgWfZQOL#YwqgIR
zj%S>t=loT~UY}IYcnnW5epgJp>-FJ8<?+g+(CvCNuHlYcCp2-D>xuHFxZY+|u~tJs
zOzf_-9e=B^TGw?tJ!0LV`oYx2erqI~IZ~+a4S3-=W?7~>F67vYiajG;H)XW!>B2|r
z*24#dI3YR|j+fnNOs5XZH9C&)-sJF!^6<1x@i25hh!~sS!BJ9bx2<!YvbvRde|ja1
zy6)UaERc9#336O(EeI(z?=BSLaCSd9IRE(Gj`3V4j#}lh-z&EzUgO%OxV>FxWsW41
zAJ%@FOX)>FYjP-mbE)mq^i<e5JLI4jvBMYf&}%MDVK(<nG7|b38@h*M=J<khsv>4w
zkV=uI)gDP$IsTM)f1-talwd!Z7G)5!CKYvAcQJ&$FrBoKkBSUeRC*Xl%($a(f9yTA
z@$@>_tF&pmDbIYob}%i*C!187czvON-{JAM5E59a6xoU@f4rcNIu-|UJ)HkO-OJ`_
z=lmq-93lbYx~%1)^g)o=A$^7-5}%keJ`MWBG}qU99-#MTrc*w3Jl#-+?dU(~6tn88
z^_3;mX<vj3Uyt}V>sNL@R1MUT3;1>4POTzrY9;Y@P|g%K%?-;(gXvP9XT3j9ui4Or
zDRufEhh0UnOZX{U?>9~?Zy$Uhf8lGxwC(Xcd#_R{0w8>T{&ty_jk59n?EK^EU1D)_
zmz0qA_Nur2pU%0SKdbKePmb4TgB%-eSM911yl1BzKDY75=W|nJFZ8;Padf?J&TEbz
z{;rp$L&Iy~95rFS{7sugpDMe9ZQXWVp^LxU#4VG4HFKdOoUC<oq1(4@x((g|2c&k$
zg@dahLF!)bow51y!*{3GSG}X(JtRTwf~`v3@UyO9pGFtSJu@AQ{}RG|5!jwLsEcT&
z%J?F^1&qtrc1Yvrt$}ujzA^r$zQ|;_o?K0BbKtgX-<?e6W;812ECqwd@LYP<bL1;q
zI=hwIXLa3`RT&g<wHJZQd3`Mu{`QU|y7Ztapy}P|@mBf0JJCUWiHBCg;~(Dg2nxf=
z=Pd_<RW{w-nfG@Ql%o&B5z3Xe2fdp=%SWv9#kO17MoLmhBlj{kjteM#w*NwAyWlmG
zKAFeSP$qzXv)TIw_pf`~g7ZXz9}_u90Z*s9WSr~wvyYLI;Zc(zJniSO_LN&a+V$(z
zbnpA$zd0jZ9pd>43YSBeqzW?1#Jit14{Ohcpic@#*MEwI`5^N5k6rN(i7ulyk2|AQ
z_mz5X?H7!B_N-cBZ%`Q5O^QEVSQlCoEOz~u?WvC(Z}A@;{L`Qrt7$obpmDs7;i2gk
zm#l2+l_8w6pCQm5woI*SyKfsdZJ9$Q%ap4OI*oiNuRF-vH!F&8-P^M{2R2H|yNN%^
z<>a^YMn7%ZJTJ#4jg%<)Bal=8pC}3PCT}aZg^0I>_^NqA>lm}AF&v4b?)a0OhPH(-
zu6xe?k2h^bE${z0+wplFk6L>^EmJ-|Ha}U2hMT=9{`Nf+MpB%LI9H>}Ic(m##XAkX
zKU7NbkPO$mDeq%Fes{VFE4&JIbzcn;e?-rJ!X9S$FDv1{2*1#KL83Elvne_YS6Xo$
zUgccxmi`v9g>)?ZE?Z~1gDez&_)pyL(e?S{bQ48lJ?8pWgGwm=-Nz59v;uF?9q;q~
zFI1JD=zB0+E<2wpj|-+Z&(aZ|n;75JS(zPtxQiPCh2WmLi1)k=nD_>4#FA+<fdikd
zgv`U}^reM=uXe`LX~o@Nimx|&J|>jdz0cG?R;CT2N^F=4VWSKGyVv}Jkb)`bi3Vr;
zWxljrZ3r>C-4?gmn|!Ja*=!)NLky@Md(D1Z9Q9V7t4K%6vk({|H%?4r3x*9d05Mog
zPKJ;Oa?$e<2wmb#G!<(Nn8i6))r!^pj3m<qVo;5UJ)nTCn3$TYzv5-thK_|pfnX+L
zLtrTr@iylxCWg6YpkJc|;_THj%WtrZ4g?O)cg)7L{mG6<v4cDdFbc|qizCA9-XDR9
z6Ej+EeoCl$$}y9akH9(!9=KSoS6Y?jSJ(<z#)(ksrU<%)mY3k>wUS2|rY~|wXIlAP
z-VsE!wC{`B*JZ2Sn<I!J%di?G3py>G2{zjaT9fS>5Q>&9g<_zqo-);?joh&GZBIJX
z8D}ytf${~U6}ROsZ)o&?JC&^;nVNi7;hCq0P80GL89xt%aK@?FKkLEsD|g9u7gJ_S
zKL=~LMVhe5=e&g{Y8+*^2JPz>#ri2KVkTXZ6(L_`=S*NIoXHZ!jn+bBtRQrdnE0$T
z3ozqyk!({7?bjKbBDi`nuph@MH-~Kl4*UY4%tx$t(-=<62IAy&%G16cuu&#nP-&fl
z$>sxRY@`ikehs|z@~`P7aKSQ+M~c>F_1(8D{;l`DBzg^jDGwcnyrt@cLUi8!J+Poz
z*YjCQz>JiFv9iK|Ys$HrNHNi2rn+X;7V^h3IDnpekRfe^v^*#=0^Pi{K#L(2qxc}?
zoRmVBStitSexVhY`*L|N)q17YO_#H($#{MwPu_<^MJK^tb8$tf2UQBz6kFxov2xQG
zQkiaHrmdd2?*L;3jWhy<r0P3bXinW64D}(1eBkj3UDcM%N(FvO98Foi?046oV$Xpk
zPk%%j8$Db$WfRkQ#k?5#!7bGBju-^f<aP(|t(ArWb#@i<KiUoILem&8OGNdIv!<sF
zwNL&a4*a-{Mk?Kn%}9!&I&E;hKz{XcpsYnR^CVCU!ZmYQ?et=~6|9qdWWOSm#GJ~Y
zl7lGlsyK5C`Q2U~b~pk{5HV$Wk=Q<4gy0lcle=>Y6RpAe@NrSx!7O&hIZl16WkxmM
zX{H_Fy+n0aL^2}&*Ur*44ny3W^~0M}7n`3q==nw_<aYJf_bfE4lLx32LAN1Cny!Nu
z@O*rWsz$i6+G8@=YvM{(ao65o8)!nou>7%<i9p#8OfeF)shuJVb#MK{d@IfXcTy0>
zE$lrV<C6gKnv^g)7K9ezt}rp-<?>J25m!W`I-<4ddl}H2eL6yNnug8}Qq>G*sZ?cj
z-XJ479j`@7S-6x9GyqFgdNy+5M_^G1u_NS&M91hUqtHTWPZFju4L0`EaF)`G?PF7g
zNFU^ATkypZYB$zz4?uSYigjY>T&=D}R|=liV;fn>bW1L8pO+m8sk>CH5!6TTWg=Bq
z!M)1u;NRw22?huESOtiSciYa7Kni)to%9J(<e8#H3?3Xv5*7><God2Fg^8!VzBYFu
zt3BX27wM5Lt5tvVAP><YgH5D|UA|L%x5ytGcg6GbM*F^ic&58khqofTZv(ZV#gji!
z@cd?oh`&YhoTD=5iDtOmcNZDDb%nARNLfk`i+lzDZWdAWlaq%$+sMQId6dbBq#iUj
zkBNBLAAbg~oDiahP4%aw;3R1<ivg1k1F2qnfbc8AMbt#nAl6y@Ln4b~ISijwcF&c{
za;TW4dk&4t2I@@9(|wW4r}&ajWt@Khenmy%^X5N5XR|)Yo9crRa5qGv#u`#Hiq{DK
zGNARknh@MVGW|S57CKZ0t{MGg0DEKAU`zOy2AWJAscr(d+*)de!GZ|mbYYl><X%h7
z#D~f~7b=0b1@Ct=F?}(?rK8j}u5DP53I!43Y!66kMi|v4V!~aSu_yxJtvd{boQ8cb
zO_#N?bhxIQe$?f<1DGm>r8e^MnNtb1v$71{Cm4_BxPGPPxzaWtsS^-%%uH6OrXKA@
zT7D0Rd`V&Op@B$#{gaEBd;5>RH>bP#iV#s6uH6iqNag7)`}C`b5=w6h^hP2fviwo3
zV1CG{C`}hjNds`9kBa|T?I}eL0~3;6^d<93UB?Ac(+gh8H-XK=5n#yh#Pkt@AOnd;
zf+ZiwuX_kWAm~)W;bZ#60r2RE7uN8lxUb7_$vF%`#O+|1Y*)A1+6aV^wO^64NC=_o
z_zj*^MjvPdtb5g{2uTCTR5zlbDe7d}?T{6H6c!NZh6%!czdFaU@Gu{&*jRU|D-ZhV
zmOjj*yp>jKKAL;RWj@npJKA8Ax*XX;1hWVkow+^MEe6-F=?K>=tHIHg%}XI_%LqgM
zS=Xs-XGgVtb>bDTDUm6Ix8DCiX7W4)1R7YXBAJ%ycdy5zx?jMV7v_d?4fq#Gog&@n
z=R}*BV0V-#zEq~{&$1sh6XjRd$(!(IHkX8eWz2krjqZL+7SRqk`s)K)nppc)wDT?d
z(_K9evc%bk9ikU%ErQdMGR!D&KK)PyEgwi=Rb!@W(W9tf$?NwY5*=cw8f+D2T{sws
zJ|iY@6d*ToxY_DC@2;@|C6<^E{O;41gQ>qb$3RkdwCKzTz>%A^w_JPF1GeT2SQNz`
z2ts6l&8E5o>YX@HlDYXLepr&WqSA*OEq9ziQ)70Y)pg5)Ff+65gm_ky!-``2Zh}$8
zoP^;D76H}JQsyS*@^!Za43jp?k{nUqhPNEANo^rNr5R&sB3~|f^r7lB40l|)TuK+I
zbdN1XaA)fe%cGQG?#Yk8(WJ_ljtx>sz+I4cG<<KnGs1{x45nq{9LLvN11spbionj!
zl$8NxMNL(`v5)`+dBJ+9Uv=5QH`CQInpksV7gF-34_p~XEi0n1Kdq{7X2I4k1Om`n
zqo8AE7sgnk8_~mRGG#ym4Zh$<pYIa1w8n$|&Mm2}+XzuT`2E29bq;xnS79CF^+|g=
z7ktosSKtu1p+FQIC;$xv*S*q=7~2OkuQK#T7Y{fhRFi0Xy^~}^=$wZkr{roBCe=8(
zaumgzfz1q_wXVdp+gnT8q~u4ergF67;<!I&Ny1WHGF!*t-(Oxt2q6k?P0seb)F?jO
z{b%Gx`F#7bxj)1st7f|Lb@7>;6&)75eIScg<!bk>xuAxmQ}vr-#AW(aQLp5k?+668
zj~48_qETzwmWjy)N96XB0G-NnpOu1}3vf@S|D+)HfRgFeNAd$#oKNr)h|bE4n>NYy
zJ-@zms)4z7W)yYgus{v{&7o);i2Wxyyy9DrWq<2^mI`gOE79m!@UAiq@#j|rGL>=9
za%CL-Sj!ltX@Y#VRi}JnDO7NBY2SbGOBCHdIP;f;MWqR(s{nyHn46B@l^aLExsL4c
z4+ft?{Sy^U0Y-^*XetA0jBJ&mj}gG|>5^jp&?HPkuLwNdKd~XX<vGA1mT!Jq&Vi=0
zgsRm925Ot&mPFZdwNR`GV6}{KoeE4BGKNq)y`hPPBM#t1%`KhPa)iW0robNc<w4x{
zkoHIj1qX}(p_ZLYlOj_&ACm#hn#AWzE$%CAMEpSNd5<YdAR!$z+D=@=WpLFp%;KXh
zbOoTQN_ufo6=TkB8wGLmXU-5OokA)Rpiv?vCqnPz_aU`L8|BxPPvEQJ2H-T<(OJUq
z6CMhcQ%L28zzkUW``!1+_8nDSP`0Eqt}b_Hqt11kpe@H0f}d`2EObE%E0MVR6<vG7
zeqL)wpoN4H($e5M9g{@LnxGoDHVHB4{1qaR(y>H!5#ib<Hw}IQYk5Er!*X;2qcpHC
z`{_a4AGlc4fG<W+Uz-7Q$3}iKmG7AiOq390e*3}_S!=csL5+HGr{^68KYpuT{;_H$
z;p4OTefj)a)i*V&5o6u$x$l=+cPuV$yb=*w1BzfBIoO!21R1%p)b!FnbNK$ceX%tv
zGI@+lJRSUabtQ6S2PSAWS08R!+#n;T&UXFw-J!f}+Z5v($x<kV!e@=)Dbr(4Rg%0j
z6-)=60q?r3_TM;jyy#i$8IzYZK#fg&{Ckt**hpqrPs~CgfBhwt>l_pE23`WS9cld{
zLK-v&H{^zW`G6?Qc}gtCEclxR#4^n1t?R<dS|nXXR5XC5!S$~oq(q2;vM~?~9z`))
z8Qd%k?1v>&Ry%-D8>Y~J7$R;?aCM3IiRIP7YocVt?fqcmvZWGH`K`h&J2{EC0u2`8
zRmm+ExqLe<Ihb<c`jy(6AcRpV|MN8J02vTAkkyJ__bL@!vp6Q&vsaTFl<-_MM4Jk@
zPu%i*JN~89$3H9B9grT|F+5QxpbJ{Tyw2hvZVAEu#Y$fKvvi*dH=Yqz<t)L#f7#7$
zBSS{G<`R7Tj>nwT(63p5d27WmagRpX@QMa0SoUM0*-AR_5$^e*_U2M)S}0H>TGA)`
z?TVA%-Y>2%bFg~iRv#cL27F<pi_r>~HFWN1;s_;Jg*onkXCxyH>7FMz{77G=*ze0_
zNFrk{K|6a^lQ))@#Y`d2MWjiyqi9j%gO{)QYVx293_pT!8o%O5qWjeI1uQX1N^wtL
zNd>}0e1?PuLUQ;Ic%MUha7!j)3|~@_gqqCRz2x`P-<Oe~3K3@~yQg24<HgMi`xa6d
zHd8!x#N_Y6D;v>>h%L;4eM|~-(l4=M?2F_yBMlqm*a{tPHoMDC$6H;9yqLnAi6lGs
z9$Z=Y`ZTVZe_Mc{;Q5jKpS%R6$@XPL^d-{AT1&uR=a`q*{Ow~-P_DJ-vRbosY@SkO
zW_AitJ(b`?&bGcY_<-@rdKw%IEYsuq(ZCG^s~wK}mK_J-)-=4=%$yJapI!j7C3f_L
ztx$n3qM^rBeC8<J(qwJl6Dv+Wb{`>@Z8`4swE46mN)Gz`8iz^Q4{p4id>Km#-1aUK
z8|mAs7#(CZNk%T8{v?RX;>Y<(qRsZc(Pt+8a<sO}=ri;|#ylOT!aq5?sKrtBE%R#{
z`&`W}ffU25{&)7HN)=={Qk<Z8Fg9f>;s{<5OCxhn5b^%+eVf);H~F{Wm|`*DYD^Dc
zjb0(YJR}7E@=DKRuJw=&hc4#3yfO4OTg6W-|Ma4Oad%iZ7|MhwsSB2EI!5H7K{VN2
zi*pE^5L${&2yt~b4&r9TN(s2mi)Mcjg&rx+o)f5CpgcnBQ;VuylVTANZ&@sVs(4Q1
zy^h-7EENKNfheYGh7`=G!b+iUR3Y|7IcJRg9T^C7tP!&&4VBWs??6QkL1KZxuh=O`
zx@A8qW5u#X2&lcG5-DH<&OYI}5PgO!fww1Qgt$MC6)pGD5*lpTuAEQ5hdTrvTkUo^
z*tumhw>hcA*(e6IGbKbsB%f7Pjw@KaUEEo*(#<+o;+hct7i68BYD5W<4h^u)l--fn
zExI0VlM&RaSIW?CZO9rE08M|nWIN|!HZm>^wut^(#_~|N6D&re+!tT;>mshLA@_gR
z=h|YLU?`E)%ue5Giul$21VPGhvcbm>J9LIu(KX~>Q7^?O6+NMCg~M{&p2deLR7e8G
zJPfPod0%a}E%FqF7^3FzL-7H@KC<!O3m>!uvS0l@9?->cfWryr23{6+(5UX_ekuA3
z^%3e2vGI@b<kP?HT#}dPrOk2;c?8!<I3+&NyNN<6AQ<vJ`Ezg!XNbY3g-&elGrv>;
zSK0xWyp&wT8XXMbQWORS+d;WxAhCC7TL_?KijL;d7h+8mxPuEyTebf%oAkXv9r(?D
zL7pA~mVntq4rZSHhDiLKh_xE&U<6U3I9P&%)hz=UgoI47e@O~^y;6$#iWXP{&5!8-
zpF_{6Amn9;mI1sIgKv^G13G@psWx+nCL8*LLk#EDXPcICO&sr{a!VIy%gnpnQ1gq&
z1M|&_&t+VKRn|3i2Np@g{yL&aB7t9w?9ShH57o%-44{<(|2Sa!YPDyty^NXFt+@2j
zom=4JQAAK{Uk;7DbEvgv77_8tZ0zw(m+|vOgRPWcPE&H2O_PxT+0G8j-_J`ytjt`t
z(YQvLix8J>O`3&>fx(kU#IlE*&ZV|xl>vKtJ^r>j&zrc_rRc=kUk8?~W|hgWQUnLL
zwi_;P)Oy1nURk3O%*NXSsc*@6XzEF1g6F<<{Wc6w2peRupnmc3iaM?{tWsi0=AJh^
z9I`o<b(cI(!)R!%pr_(iS=rU!>di0lFO3{kHT=JA{le^CRwutI-}rEMpRq4P;3k$O
zhb9320(oxE&!1C{&pjVqP!txX&Y18}Av#H9VmdgV?mCxF5KEIpWcL2^F7=^y4OsI6
zkv8))Oo2O`hDFIZDb4CnML#%4tsJN(!5HgYgjiDSp(B$_(14pwOc~{Pcm-$!!Q~Sn
z9=`wN087*VrS}a1T;Su64x2PvQFKFaHEn#|a<2~Cx(fqV6^7})sUrH?%Ef=y=XmcU
z*b9CJ?Xj>l5t&fiqYGu;jmb0llQb_HC~IKe8H0IQ-B?e+VEJ=(p8F=1baK$d)w?0d
zX>Q1`MR3$cf2$<GGAY0Gpv&;KwELT<=t7d&vd3}Wy90*ZuJV*!8Z&~b?cnrVAram5
zXgXja-nAD08_p*?s86+GAWTcFcLRynRPes|70T5I!a{l4zl<22`TPh#_zuv5csXl=
zWt||@6bR=s!%b}jFg;KZJe~1uCD~$5EC27cHXwWA2<z~29CtX2npT1x!-ys-E@#As
z_SAJPJCL9SzF7S^c7kxJ>kYe&MkFtf#aGQmr{8|4palP$cq;6d9O7&J7Y-U1=yA;1
zflJM+8=r=;4or9@e|fUyofV(MyKc)|u5P0X!<Y%2wZ(F<|LpIe5qt9PjhLBcB2EA}
zk-K6C)bZFkZ960Kh3R1=z?7YkrXZ?!2vxZ3uO?ZdPB&m=!8w<2L?+YUeC0bk#@%gX
zSo0>lq%i|*=smy9N?RoBxJ_?dECU<sdS#<)Y^6kdsNT8_e|}Il>Qic{1>7XX_|8hK
zI+yN;Ei(v_C0;1KO)Ipw`S6gKA^T?$fi|usF>R=Kl12b0ul;gR7bFjJ&-l=iYnWN2
z42fw4V}^opxjt}-Lt5(2b0}|^fbkCcq@vHDwAvo<Je@TYzts?{d1=_-slkZddJe7i
zDwAAw4b+xhcdll~Sa)D`>)_`gZk@Ga2sHQ@7Cc;r^P=u;<3TD!Ks`oEm00=m=kB$#
z=udte&!XK8ID?NcMCa+77x>gGriGf#OK)H~y?OFZTaIF6*`WHLbuZ;NrGo5liGMe)
zKxArq6_*Jw##Lo3EJ?oTgR{A~v9j2J#>0ZEE9ekJPMFz)+C|zwyrvDFR&E8hDDPun
zsgG4>ux?Lk^x}UZkpHKGxBK}mK80t$N7kxT13)->W^7I=)LXdA*j>$7ciQM&do5rE
z+@$B_|DcRPOpJuoW(&mjQjY*HO5EEkWE}w*;_$opDgV+-ITcXe*>5RG!|VWF4<^K*
zB&%ZuOk0!t9%-i=8aQ3C2bXjQzoJU;15JaYfCM5C*i11H2@jdrFWgjyF#cF_hnUmi
zEdAD)kk|Zd99N$Pfc$=Vne5$xipm2{^AMwFvg7>A$X}zBeHrfN|1kc|c{YSq3^Ds&
zJ&pg;1k7Olw;}j7%B6}TBrM&yuF`9tq7t=okF^mPSI9)*PCBD^r$82j5FLo`W;;q^
zTrhQ>h#@t%!M01p!v4OGmFmYS^)10@WK|W4J|D5pna2Y^U$7DQ7A$7J;7SjAH>b0M
zwb#g-LW-)RW|>nY?=f|7s0{dKX|>=jcd30Zuwic05fim#MT5?5)Bk3l`)9Dp=NO_;
z!ybIexMIvi%of=M=}2bAr4+-jJ#UBF0TVsSG!*NqXR<V*{&MUTuPRk7nIW2QRoGss
zZ8}Q+B||jUUY>P-{k{w9i0^DYf>V_f>V7Cx3y_N$1anoDH2`z>-khoNW6;TP=k7k2
zf`H1u(lC^d+W;7Y@Z@tsdcn8v*J8yn3MvM`1J=Za)8KVcQbedOFn!X=jYDPt+_O`R
zaJ>#@(1V2DylNJKeFZk=hXw8?J-QX-<m{(<LBYP#O>i)C!svl21=I!HfdFoKL%{*o
zf0lvP_21=H<`WEnnZ*PlU$_oZC(RrcU{3W}1n?qBmtr9)L+|$lM!-un^HzdZo4`p;
z<KGZ4K2(CL|4T?2onww>Phxtgt@~t5=UzQarA7;XI63^QP4%$>_&w{~NYB>X%<x}Y
zi&?>TBrkq&6=pN6JJq?q*mHiA5HPt=>*1No+qTTq1hw-5XSc!87TSJUUXiLCGvi!;
za>f!rmVMn;NwA3ot}JChqE}_Yf+KgWpHGpc9?EltugWA3155QJEdGp}$`dV=Y9Y{2
zT7AGAP6QedsPB(>0N*tUMligg_<@jJ+yjtn(1O7YBGX8PGdYsOcW=F!B0J?A=&A^5
zImpAP`7DM9A4f-*<Ic}OHYSPRSiA?Mg+JZoMI7|o7H<bSzcd^D@_~(N!MPYj7p9ek
z6(&-KKI!t?5>q0vB38lR-0(vtcDEU7#CW6@NPIWAFMrWe{QfI~Syy?bYgTF|BdgI@
zNO%{KQTWc!7{3$a5Nuu71<L7{A%2;X&UqW(6y)TjZ~_kaM0^bY96&n73Q_l%Udlk&
zwgSVa(l|2Bz=0NsiOmdzXe;82T;RPWToF<Pk8UU&D1yF|r{#o)QxLCOV|};8QU_aN
zAv1urxvDAP(R#JL41{{Qd=nmLO};WDa32E4D{P;WrCmwQ67=`r`|12VR=9#s;Bic`
zo9%m-TVD)MEKfbQmxUO!W#Z(5glV&@lOpqycz(lF+aclQP_gc5HdIE-!Q>zBQ#`IR
zeWxsQ4QvFiG>lu$^O22v(?hTxYsoMi=Z5^n=x%E<k&$wvb%mYj=)P=!8Qz168f|GC
zJmD6KkQauasU!{T24i|4^!AH1JegRxOMgPyh&W&VHyrqXR6(hAFW8pB)`(jbG=@KN
zG;C~kKtGP}9yEAfFwlhfNc=I7&|PiMT^KU-3tR-94my&4ugX_ERgHY;1nTaoJy(e?
z@0<2!4BJbY@B#;Vlwzxt6iIh!i1`1_K||oY-C!}nGN#Ik_uS|@)6!9hFWrVrY48Gf
zaLj8%i%@ut9z>;khJX$;*j*j=oWXM9f5+D@IvYMg1cOeMO)34Ta4h0~E#!X4UbB~w
baI$Cav;BIBA!wfEw|@W6|LqUE=-dSWqat^g

diff --git a/htdocs/includes/escpos/test/integration/resources/output/qr-code.bin b/htdocs/includes/escpos/test/integration/resources/output/qr-code.bin
deleted file mode 100644
index a1e687f151c8f8db633da3fa63fcc0d67fbb6671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1551
zcmbW1%}>HG6u_t8We4M(m^^M6J#6Dcy@^WVK@6zzUbhOBwVhq3gTLN4zC;<Yx=Wk9
z^q1e>SLLcwb^4Fs%YZ^axwI=)>$o;5TW;ISE+xyoDb3D~gXf{;_MB%LYbFNZdi7bT
z?{sCXA!a-ZDbSQ;r)^ir9>$GXPlPWaXW&zz6%7z(p`3F|Gyy757!7vWo@TZVYBrj!
z^NY*vx5ckKB%CVd+x9m1DVe<b0eu?`+50HuLPj4d*2(8rI-dNFEXeIJ8WK?$Zx#F&
z_-iJJ8e`h4PDd%Ju&PQ?Uo$CoC2CVy|8n4db6Q;VD9q_@=6EKY{$@_rn}vPurfKW3
zl!n;G6PlN>teJ5hw$8y10bHnYCKyln$-3me8OwupM3J#v(WyfXo0TM?&e18G=`?b5
z4$KhE97Hy8CJA<O7)OST7FLO*^D51jA;)DHt~7vavIudRcC+{3{;y)o_g+rD>Lw;#
k<|_&F<!;x6#08y1kyM%nAO(;xgh(-=sfx3fcxjiu0iptB6#xJL

diff --git a/htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin b/htdocs/includes/escpos/test/integration/resources/output/receipt-with-logo.bin
deleted file mode 100644
index a4ed9c3530402d4cd54e0f00c07bdd3af9a7ed4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9579
zcmeI2L2DaF6vy9Y4-2|X>8YT^J0>~w5QL=Ip$*1cQ(OqxX~7|PHI^$;+biUCaG-b<
zbkNsY<Aaa+2p!`?E`{!K4a>g1nc0z4RhHU7dT3|(d)C_d?ac6hZ+6UB)o-dT=fRgd
zpFgbk>W<TR?ED6{SO-3>0|726xg0-U0->UoL0HJX{(VYKP7ZxnIhPHVA``3=CP%Cj
z)(PW)x!Rogn@(h!TjJOMkctJMfLO3m27V5VHXZk-fGi$t`eOX{#ni!!#C|Pk>xBS`
z`hakY$!44yirQVwNsRVY#6gS$aOrxBBEZa0ZkBtZ@UUQr4q}q~iKG(5G@xC(jF2bJ
zy=0SWmd0-8Cz(eSp*Tu|iz#Z8C8U6fV3@LNMP*DBZW;^<)0b>dK-K;*^{!=<-P9Ag
zn+3#_BdT7ABKafXUCZ59QO*qI72ppfbtSwM6QTt5^=AsvL!l^kCEQfHG9)USrCiJ=
zRE&2}fcb>-aX7y(2#N{i;pIF^&Q?=u_7LCPK|wrrLVzcf6Em}?zJQD+NmuWnJn<D9
z_{v)qq12_mGM31`CK2+44kAT67-sAulOxKg6ZLK!Z8t3#rNwQ*a&!tx1Dc{+1d6&D
zQx4{oT$3!M)KXa}`<i4Ss9aSUoy&|?xk?!=sYymdOnINu0%7mf>Ie$ZtAnUuvO3s6
zW`qyyf~HMMi4s&ve+DMM<VRI#)}|0FOF%zm7OKy(veej$xxdW%H5dAetCpJYfVpd3
zwN4lZ%=J^`#C=Dgmu=i%fp|E~S6J%F3#75E$E$Y3NpX~KtgHZzsKF=dvapnO!sZ11
zb!u0Kc{5ojtP>x*chEjGd7H?6XwD8}cEb5r<Nf?rbJtSV3FCmd+MM_=IYB2>-e6X4
z0!BL8Oh74l(p1V*rzfh`l%GN=0dx$f#ZoZRRFFZb6apikPAW=iDy9PttqfwLAO|B&
z$s;?hoQ|7H#dO+NN>TKmGCHzTDjY0DM}1>ys=(ot+yY5Xf$xk88FtL$t0|50m^94e
zOCwEX!S7Rgp9Q3=Ecjrgsno}X(v)CylCwaXN<3UBO$}VUQw}w03LIQ0MNzdt=c*Op
zmxbC;tpK0R(-#2KlJ47L9k333yaV*Ln0rufR#*A<S?j2G*xqgRBfb;u*DBRj*z1Hn
z{vxdLwPvkSsct)aTRYo({P~Ml-#`C$n{Gh01$3MLv+_tjS&qlMQTvELY%J_ytyZsB
zwvNN7)9&-A(>?xaA<p@e+IqdR7ap}W+&(;MFMgt-M&JkC<JO^`(qf*k)z;RPBd0$`
zVMGrtFO6pHYxxXRw)kQAnx2VTXG<Sz)SlES7X0PxD35q!t=6OtSE0IpkG|scveP>L
znZFHB`9av{CltG$bgC6i$F}kvwMG5bzHI7*r~Q-1oWkBBgWhycx)E>dJgB`6k1Evf
uZg{-kddr_i9UdO=tzN%-$eZ=XI<GgMtv`L%T<1URRvx_Ca;v@i#@Qc?v`v`+

diff --git a/htdocs/includes/escpos/test/integration/resources/output/text-size.bin b/htdocs/includes/escpos/test/integration/resources/output/text-size.bin
deleted file mode 100644
index 4d36038e463c3bd08e9d1298813557cf5dcaac0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 368
zcmY+<O-}+b5P)G44wAhYkDEzmG%<QHd@Nv0OfY!x;7#Seuw}bgx7ZfT^6Qy&8<q3C
z^Guu0(pgHqWG?f%6evYiN{83ztHQ}7r4CSM0CYYCx*P$GGN9)%(8mO5Jq7aj-285b
zCDgTQ@TQd>v)hMO>9TUc%2ib6th}+ZV#S^)@eM5#$Umje%7B$&R5Dh^tV~#$w#q`7
z2J74y?a_(7i}%morNHl9wfe**k7``&J#KbiTZ{Tf7<4>V`Jur=mv`Y)0pk1OKhu8^
fN@?`ksDeWFnwwHshg)rJwNxjy4|Ni2SUh!)7zJM*

diff --git a/htdocs/includes/escpos/test/phpunit.xml b/htdocs/includes/escpos/test/phpunit.xml
deleted file mode 100644
index f9a6579cf45..00000000000
--- a/htdocs/includes/escpos/test/phpunit.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<phpunit bootstrap="bootstrap.php"
-timeoutForSmallTests="1"
-timeoutForMediumTests="10"
-timeoutForLargeTests="60"
-verbose="true"
-strict="true"
->
-  <testsuites>
-    <testsuite name="unit">
-      <directory>unit</directory>
-    </testsuite>
-    <testsuite name="integration">
-      <directory>integration</directory>
-    </testsuite>
-  </testsuites>
-</phpunit>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php b/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
deleted file mode 100644
index b3e72452a9f..00000000000
--- a/htdocs/includes/escpos/test/unit/AbstractCapabilityProfileTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * Test that all sub-classes of AbstractCapabilityProfile
- * are creating data in the right format.
- */
-class EscposCapabilityProfileTest extends PHPUnit_Framework_TestCase {
-	private $profiles;
-	private $checklist;
-	
-	function setup() {
-		$this -> profiles = array('DefaultCapabilityProfile', 'EposTepCapabilityProfile', 'SimpleCapabilityProfile', 'StarCapabilityProfile', 'P822DCapabilityProfile');
-		$this -> checklist = array();
-		foreach($this -> profiles as $profile) {
-			$this-> checklist[] = $profile::getInstance();
-		}
-	}	
-	
-	function testSupportedCodePages() {
-		foreach($this -> checklist as $obj) {
-			$check = $obj -> getSupportedCodePages();
-			$this -> assertTrue(is_array($check) && isset($check[0]) && $check[0] == 'CP437');
-			$custom = $obj -> getCustomCodePages();
-			foreach($check as $num => $page) {
-				$this -> assertTrue(is_numeric($num) && ($page === false || is_string($page)));
-				if($page === false || strpos($page, ":") === false) {
-					continue;
-				}
-				$part = explode(":", $page);
-				if(!array_shift($part) == "custom") {
-					continue;
-				}
-				$this -> assertTrue(isset($custom[implode(":", $part)]));
-			}
-		}
-	}
-	
-	function testCustomCodePages() {
-		foreach($this -> checklist as $obj) {
-			$check = $obj -> getCustomCodePages();
-			$this -> assertTrue(is_array($check));
-			foreach($check as $name => $customMap) {
-				$this -> assertTrue(is_string($name));
-				$this -> assertTrue(is_string($customMap) && mb_strlen($customMap, 'UTF-8') == 128);
-			}
-		}
-	}
-	
-	function testSupportsBitImage() {
-		foreach($this -> checklist as $obj) {
-			$check = $obj -> getSupportsBitImage();
-			$this -> assertTrue(is_bool($check));
-		}
-	}
-	
-	function testSupportsGraphics() {
-		foreach($this -> checklist as $obj) {
-			$check = $obj -> getSupportsGraphics();
-			$this -> assertTrue(is_bool($check));
-		}
-	}
-	
-	function testSupportsQrCode() {
-		foreach($this -> checklist as $obj) {
-			$check = $obj -> getSupportsQrCode();
-			$this -> assertTrue(is_bool($check));
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/EscposImageTest.php b/htdocs/includes/escpos/test/unit/EscposImageTest.php
deleted file mode 100644
index f152f400a2f..00000000000
--- a/htdocs/includes/escpos/test/unit/EscposImageTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-class EscposImageTest extends PHPUnit_Framework_TestCase {
-	/**
-	 * Checking loading of an empty image - requires no libraries
-	 */
-	public function testNoLibrariesBlank() {
-		$this -> loadAndCheckImg(null, false, false, 0, 0, "");
-	}
-
-	/**
-	 * BMP handling not yet implemented, but these will use
-	 * a native PHP bitmap reader.
-	 * This just tests that they are not being passed on to another library.
-	 */
-	public function testBmpBadFilename() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg('not a real file.bmp', false, false, 1, 1, "\x80");
-	}
-
-	public function testBmpBlack() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg("canvas_black.bmp", false, false, 0, 0, "\x80");
-	}
-
-	public function testBmpBlackWhite() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg("black_white.bmp", false, false, 0, 0, "\xc0\x00");
-	}
-
-	public function testBmpWhite() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg("canvas_white.bmp", false, false, 0, 0, "\x00");
-	}
-
-	/**
-	 * GD tests - Load tiny images and check how they are printed.
-	 * These are skipped if you don't have gd.
-	 */
-	public function testGdBadFilename() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg('not a real file.png', true, false, 1, 1, "\x80");
-	}
-
-	public function testGdBlack() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('canvas_black.' . $format, true, false, 1, 1, "\x80");
-		}
-	}
-
-	public function testGdBlackTransparent() {
-		foreach(array('png', 'gif') as $format) {
-			$this -> loadAndCheckImg('black_transparent.' . $format, true, false, 2, 2, "\xc0\x00");
-		}
-	}
-
-	public function testGdBlackWhite() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('black_white.' . $format, true, false, 2, 2, "\xc0\x00");
-		}
-	}
-
-	public function testGdWhite() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('canvas_white.' . $format, true, false, 1, 1, "\x00");
-		}
-	}
-
-	/**
-	 * Imagick tests - Load tiny images and check how they are printed
-	 * These are skipped if you don't have imagick
-	 */
-	public function testImagickBadFilename() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckImg('not a real file.png', false, true, 1, 1, "\x80");
-	}
-
-	public function testImagickBlack() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('canvas_black.' . $format, false, true, 1, 1, "\x80");
-		}
-	}
-
-	public function testImagickBlackTransparent() {
-		foreach(array('png', 'gif') as $format) {
-			$this -> loadAndCheckImg('black_transparent.' . $format, false, true, 2, 2, "\xc0\x00");
-		}	
-	}
-
-	public function testImagickBlackWhite() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('black_white.' . $format, false, true, 2, 2, "\xc0\x00");
-		}
-	}
-
-	public function testImagickWhite() {
-		foreach(array('png', 'jpg', 'gif') as $format) {
-			$this -> loadAndCheckImg('canvas_white.' . $format, false, true, 1, 1, "\x00");
-		}		
-	}
-
-	/**
-	 * Mixed test - Same as above, but confirms that each tiny image can be loaded
-	 * under any supported library configuration with the same results.
-	 * These are skipped if you don't have gd AND imagick
-	 */
-	public function testLibraryDifferences() {
-		if(!EscposImage::isGdLoaded() || !EscposImage::isImagickLoaded()) {
-			$this -> markTestSkipped("both gd and imagick plugin are required for this test");
-		}
-		$inFile = array('black_white.png', 'canvas_black.png', 'canvas_white.png');
-		foreach($inFile as $fn) {
-			// Default check
-			$im = new EscposImage(dirname(__FILE__) . "/resources/$fn");
-			$width = $im -> getWidth();
-			$height = $im -> getHeight();
-			$data = $im -> toRasterFormat();
-			// Gd check
-			$this -> loadAndCheckImg($fn, true, false, $width, $height, $data);
-			// Imagick check
-			$this -> loadAndCheckImg($fn, false, true, $width, $height, $data);
-		}
-	}
-
-	/**
-	 * PDF tests - load tiny PDF and check for well-formedness
-	 * These are also skipped if you don't have imagick
-	 * @medium
-	 */
-	public function testPdfAllPages() {
-		$this -> loadAndCheckPdf('doc.pdf', null, 1, 1, array("\x00", "\x80"));
-	}
-
-	public function testPdfBadFilename() {
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckPdf('not a real file', null, 1, 1, array());
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testPdfBadRange() {
-		// Start page is after end page.
-		$this -> setExpectedException('Exception');
-		$this -> loadAndCheckPdf('doc.pdf', array(1, 0), 1, 1, array("\x00", "\x80"));
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testPdfFirstPage() {
-		$this -> loadAndCheckPdf('doc.pdf', array(0, 0), 1, 1, array("\x00"));
-	}
-	
-	/**
-	 * @medium
-	 */
-	public function testPdfMorePages() {
-		$this -> loadAndCheckPdf('doc.pdf', array(1, 20), 1, 1, array("\x80"));
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testPdfSecondPage() {
-		$this -> loadAndCheckPdf('doc.pdf', array(1, 1), 1, 1, array("\x80"));
-	}
-
-	/**
-	 * @medium
-	 */
-	public function testPdfStartPastEndOfDoc() {
-		// Doc only has pages 0 and 1, can't start reading from 2.
-		$this -> markTestIncomplete("Test needs revising- produces output due to apparent imagick bug.");
-		$this -> setExpectedException('ImagickException');
-		$this -> loadAndCheckPdf('doc.pdf', array(2, 3), 1, 1, array());
-	}
-
-	/**
-	 * Load an EscposImage with (optionally) certain libraries disabled and run a check.
-	 */
-	private function loadAndCheckImg($fn, $gd, $imagick, $width, $height, $rasterFormat = null) {
-		$img = $this -> getMockImage($fn === null ? null : dirname(__FILE__) . "/resources/$fn", $gd, $imagick);
-		$this -> checkImg($img, $width, $height, $rasterFormat);
-	}
-
-	/**
-	 * Same as above, loading document and checking pages against some expected values.
-	 */
-	private function loadAndCheckPdf($fn, array $range = null, $width, $height, array $rasterFormat = null) {
-		if(!EscposImage::isImagickLoaded()) {
-			$this -> markTestSkipped("imagick plugin required for this test");
-		}
-		$pdfPages = EscposImage::loadPdf(dirname(__FILE__) . "/resources/$fn", $width, $range);
-		$this -> assertTrue(count($pdfPages) == count($rasterFormat), "Got back wrong number of pages");
-		foreach($pdfPages as $id => $img) {
-			$this -> checkImg($img, $width, $height, $rasterFormat[$id]);
-		}
-	}
-
-	/**
-	 * Check image against known width, height, output.
-	 */
-	private function checkImg(EscposImage $img, $width, $height, $rasterFormat = null) {
-		if($rasterFormat === null) {
-			echo "\nImage was: " . $img -> getWidth() . "x" . $img -> getHeight() . ", data \"" . friendlyBinary($img -> toRasterFormat()) . "\"";
-		}
-		$this -> assertTrue($img -> getHeight() == $height);
-		$this -> assertTrue($img -> getWidth() == $width);
-		$this -> assertTrue($img -> toRasterFormat() == $rasterFormat);
-	}
-
-	/**
-	 * Load up an EsposImage with given libraries disabled or enabled. Marks the test
-	 * as skipped if you ask for a library which is not loaded.
-	 */
-	private function getMockImage($path, $gd, $imagick) {
-		/* Sanity checks */
-		if($gd && !EscposImage::isGdLoaded()) {
-			$this -> markTestSkipped("gd plugin required for this test");
-		}
-		if($imagick && !EscposImage::isImagickLoaded()) {
-			$this -> markTestSkipped("imagick plugin required for this test");
-		}
-		$stub = $this -> getMockBuilder('EscposImage')
-				-> setMethods(array('isGdSupported', 'isImagickSupported'))
-				-> disableOriginalConstructor()
-				-> getMock();
-		$stub -> method('isGdSupported')
-				-> willReturn($gd);
-		$stub -> method('isImagickSupported')
-				-> willReturn($imagick);
-		$stub -> __construct($path);
-		return $stub;
-	}
-}
\ No newline at end of file
diff --git a/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php b/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
deleted file mode 100644
index 2bbdb34c20c..00000000000
--- a/htdocs/includes/escpos/test/unit/EscposPrintBufferTest.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * Example strings are pangrams using different character sets, and are
- * testing correct code-table switching.
- * 
- * When printed, they should appear the same as in this source file.
- * 
- * Many of these test strings are from:
- * - http://www.cl.cam.ac.uk/~mgk25/ucs/examples/quickbrown.txt
- * - http://clagnut.com/blog/2380/ (mirrored from the English Wikipedia)
- */
-class EscposPrintBufferTest extends PHPUnit_Framework_TestCase {
-	protected $buffer;
-	protected $outputConnector;
-	
-	protected function setup() {
-		$this -> outputConnector = new DummyPrintConnector();
-		$printer = new Escpos($this -> outputConnector);
-		$this -> buffer = $printer -> getPrintBuffer();
-	}
-	
-	protected function checkOutput($expected = null) {
-		/* Check those output strings */
-		$outp = $this -> outputConnector -> getData();
-		if($expected === null) {
-			echo "\nOutput was:\n\"" . friendlyBinary($outp) . "\"\n";
-		}
-		$this -> assertEquals($expected, $outp);
-	}
-
-	protected function tearDown() {
-		$this -> outputConnector -> finalize();
-	}
-
-	public function testRawTextNonprintable() {
-		$this -> buffer -> writeTextRaw("Test" . Escpos::ESC . "v1\n");
-		$this -> checkOutput("\x1b@Test?v1\x0a"); // ASCII ESC character is substituted for '?'
-	}
-
-	public function testDanish() {
-		$this -> buffer -> writeText("Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.\n");
-		$this -> checkOutput("\x1b@Quizdeltagerne spiste jordb\x91r med fl\x1bt\x02\x9bde, mens cirkusklovnen Wolther spillede p\x86 xylofon.\x0a");
-	}
-
-	public function testGerman() {
-		$this -> buffer -> writeText("Falsches Üben von Xylophonmusik quält jeden größeren Zwerg.\n");
-		$this -> checkOutput("\x1b@Falsches \x9aben von Xylophonmusik qu\x84lt jeden gr\x94\xe1eren Zwerg.\x0a");
-	}
-
-	public function testGreek() {
-		$this -> buffer -> writeText("Ξεσκεπάζω την ψυχοφθόρα βδελυγμία");
-		$this -> checkOutput("\x1b@\x1bt\x0b\xbd\xde\xec\xe4\xde\xea\x9b\xe0\xfa \xee\xe1\xe7 \xf6\xf2\xf4\xe9\xf3\xe2\xa2\xeb\xd6 \xd7\xdd\xde\xe5\xf2\xd8\xe6\x9f\xd6");
-	}
-	
-	public function testGreekWithDiacritics() {
-		// This is a string which is known to be un-printable in ESC/POS (the grave-accented letters are not in any code page),
-		// so we are checking the substitution '?' for unknown characters.
-		$this -> buffer -> writeText("Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο.\n");
-		$this -> checkOutput("\x1b@\xe2\xe0\x1bt\x0b\xe0\x9d\xde\xed \xe4\xd6? \xe6\xf2\xeb\xee\xe3?\xed \xdd?\xe7 \xe2? \xd7\xeb? \xea\xe3? \xec\xee? \xf4\xeb\xf2\xec\xd6\xf3? \xe8\x9d\xf3\xfa\xee\xe9.\x0a");
-	}
-
-	public function testEnglish() {
-		$this -> buffer -> writeText("The quick brown fox jumps over the lazy dog.\n");
-		$this -> checkOutput("\x1b@The quick brown fox jumps over the lazy dog.\n");
-	}
-
-	public function testSpanish() {
-		// This one does not require changing code-pages at all, so characters are just converted from Unicode to CP437.
-		$this -> buffer -> writeText("El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y frío, añoraba a su querido cachorro.\n");
-		$this -> checkOutput("\x1b@El ping\x81ino Wenceslao hizo kil\xa2metros bajo exhaustiva lluvia y fr\xa1o, a\xa4oraba a su querido cachorro.\x0a");
-	}
-
-	public function testFrench() {
-		$this -> buffer -> writeText("Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en canoë au delà des îles, près du mälström où brûlent les novæ.\n");
-		$this -> checkOutput("\x1b@Le c\x1bt\x10\x9cur d\xe9\xe7u mais l'\xe2me plut\xf4t na\xefve, Lou\xffs r\xeava de crapa\xfcter en cano\xeb au del\xe0 des \xeeles, pr\xe8s du m\xe4lstr\xf6m o\xf9 br\xfblent les nov\xe6.\x0a");
-	}
-
-	public function testIrishGaelic() {
-		// Note that some letters with diacritics cannot be printed for Irish Gaelic text, so text may need to be simplified.
-		$this -> buffer -> writeText("D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh.\n");
-		$this -> checkOutput("\x1b@D'fhuascail \x1bt\x02\xd6osa, \xe9rmhac na h\xe0ighe Beannaithe, p\xa2r \x90ava agus \xb5dhaimh.\x0a");
-	}
-
-	public function testHungarian() {
-		$this -> buffer -> writeText("Árvíztűrő tükörfúrógép.\n");
-		$this -> checkOutput("\x1b@\x1bt\x02\xb5rv\xa1zt\x1bt\x12\xfbr\x8b t\x81k\x94rf\xa3r\xa2g\x82p.\x0a");
-	}
-	
-	public function testIcelandic() {
-		$this -> buffer -> writeText("Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa.");
-		$this -> checkOutput("\x1b@K\x91mi n\x1bt\x02\xec \x94xi h\x82r ykist \xe7j\xa2fum n\xa3 b\x91\xd0i v\xa1l og \xa0drepa.");
-	}
-
-	public function testJapaneseHiragana() {
-		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
-		$this -> buffer -> writeText(implode("\n", array("いろはにほへとちりぬるを",  " わかよたれそつねならむ", "うゐのおくやまけふこえて",  "あさきゆめみしゑひもせす")) . "\n");
-		$this -> checkOutput();
-	}
-
-	public function testJapaneseKatakana() {
-		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
-		$this -> buffer -> writeText(implode("\n", array("イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム", "ウヰノオクヤマ ケフコエテ アサキユメミシ ヱヒモセスン")) . "\n");
-		$this -> checkOutput("\x1b@\x1bt\x01\xb2\xdb\xca\xc6\xce\xcd\xc4 \xc1\xd8\xc7\xd9\xa6 \xdc\xb6\xd6\xc0\xda\xbf \xc2\xc8\xc5\xd7\xd1\x0a\xb3\xb2\xc9\xb5\xb8\xd4\xcf \xb9\xcc\xba\xb4\xc3 \xb1\xbb\xb7\xd5\xd2\xd0\xbc \xb4\xcb\xd3\xbe\xbd\xdd\x0a");
-	}
-
-	public function testJapaneseKataKanaHalfWidth() {
-		$this -> buffer -> writeText(implode("\n", array("ｲﾛﾊﾆﾎﾍﾄ ﾁﾘﾇﾙｦ ﾜｶﾖﾀﾚｿ ﾂﾈﾅﾗﾑ", "ｳｲﾉｵｸﾔﾏ ｹﾌｺｴﾃ ｱｻｷﾕﾒﾐｼ ｴﾋﾓｾｽﾝ")) . "\n");
-		$this -> checkOutput("\x1b@\x1bt\x01\xb2\xdb\xca\xc6\xce\xcd\xc4 \xc1\xd8\xc7\xd9\xa6 \xdc\xb6\xd6\xc0\xda\xbf \xc2\xc8\xc5\xd7\xd1\x0a\xb3\xb2\xc9\xb5\xb8\xd4\xcf \xb9\xcc\xba\xb4\xc3 \xb1\xbb\xb7\xd5\xd2\xd0\xbc \xb4\xcb\xd3\xbe\xbd\xdd\x0a");
-	}
-	
-	public function testLatvian() {
-		$this -> buffer -> writeText("Glāžšķūņa rūķīši dzērumā čiepj Baha koncertflīģeļu vākus.\n");
-		$this -> checkOutput("\x1b@Gl\x1bt!\x83\xd8\xd5\xe9\xd7\xeca r\xd7\xe9\x8c\xd5i dz\x89rum\x83 \xd1iepj Baha koncertfl\x8c\x85e\xebu v\x83kus.\x0a");
-	}
-
-	public function testPolish() {
-		$this -> buffer -> writeText("Pchnąć w tę łódź jeża lub ośm skrzyń fig.\n");
-		$this -> checkOutput("\x1b@Pchn\x1bt\x12\xa5\x86 w t\xa9 \x88\xa2d\xab je\xbea lub o\x98m skrzy\xe4 fig.\x0a");
-	}
-
-	public function testRussian() {
-		$this -> buffer -> writeText("В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!\n");
-		$this -> checkOutput("\x1b@\x1bt\x11\x82 \xe7\xa0\xe9\xa0\xe5 \xee\xa3\xa0 \xa6\xa8\xab \xa1\xeb \xe6\xa8\xe2\xe0\xe3\xe1? \x84\xa0, \xad\xae \xe4\xa0\xab\xec\xe8\xa8\xa2\xeb\xa9 \xed\xaa\xa7\xa5\xac\xaf\xab\xef\xe0!\x0a");
-	}
-
-	public function testThai() {
-		$this -> markTestIncomplete("Non-ASCII character sets not yet supported.");
-		$this -> buffer -> writeText("นายสังฆภัณฑ์ เฮงพิทักษ์ฝั่ง ผู้เฒ่าซึ่งมีอาชีพเป็นฅนขายฃวด ถูกตำรวจปฏิบัติการจับฟ้องศาล ฐานลักนาฬิกาคุณหญิงฉัตรชฎา ฌานสมาธิ\n"); // Quotation from Wikipedia
-		$this -> checkOutput();
-	}
-
-	public function testTurkish() {
-		$this -> buffer -> writeText("Pijamalı hasta, yağız şoföre çabucak güvendi.\n");
-		$this -> checkOutput("\x1b@Pijamal\x1bt\x02\xd5 hasta, ya\x1bt\x0d\xa7\x8dz \x9fof\x94re \x87abucak g\x81vendi.\x0a");
-	}
-	
-	public function testArabic() {
-		$this -> markTestIncomplete("Right-to-left text not yet supported.");
-		$this -> buffer -> writeText("صِف خَلقَ خَودِ كَمِثلِ الشَمسِ إِذ بَزَغَت — يَحظى الضَجيعُ بِها نَجلاءَ مِعطارِ" . "\n"); // Quotation from Wikipedia
-		$this -> checkOutput();
-	}
-	
-	public function testHebrew() {
-		// RTL text is more complex than the above.
-		$this -> markTestIncomplete("Right-to-left text not yet supported.");
-		$this -> buffer -> writeText("דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה" . "\n");
-		$this -> checkOutput();
-	}
-}
-
diff --git a/htdocs/includes/escpos/test/unit/EscposTest.php b/htdocs/includes/escpos/test/unit/EscposTest.php
deleted file mode 100644
index 6fd0bd7d204..00000000000
--- a/htdocs/includes/escpos/test/unit/EscposTest.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-class EscposTest extends PHPUnit_Framework_TestCase {
-	protected $printer;
-	protected $outputConnector;
-
-	protected function setup() {
-		/* Print to nowhere- for testing which inputs are accepted */
-		$this -> outputConnector = new DummyPrintConnector();
-		$this -> printer = new Escpos($this -> outputConnector);
-	}
-
-	protected function checkOutput($expected = null) {
-		/* Check those output strings */
-		$outp = $this -> outputConnector -> getData();
-		if($expected === null) {
-			echo "\nOutput was:\n\"" . friendlyBinary($outp) . "\"\n";
-		}
-		$this -> assertEquals($expected, $outp);
-	}
-
-	protected function tearDown() {
-		$this -> outputConnector -> finalize();
-	}
-	
-	protected function requireGraphicsLibrary() {
-		if(!EscposImage::isGdLoaded() && !EscposImage::isImagickLoaded()) {
-			// If the test is about to do something which requires a library,
-			// something must throw an exception.
-			$this -> setExpectedException('Exception');
-		}
-	}
-
-    public function testInitializeOutput() {
-		$this -> checkOutput("\x1b\x40");
-    }
-
-    public function testTextStringOutput() {
-		$this -> printer -> text("The quick brown fox jumps over the lazy dog\n");
-		$this -> checkOutput("\x1b@The quick brown fox jumps over the lazy dog\n");
-    }
-
-    public function testTextDefault() {
-		$this -> printer -> text();
-		$this -> checkOutput("\x1b@");
-    }
-
-    public function testTextString() {
-		$this -> printer -> text("String");
-		$this -> printer -> text(123);
-		$this -> printer -> text();
-		$this -> printer -> text(null);
-		$this -> printer -> text(1.2);
-		$this -> printer -> text(new FooBar("FooBar"));
-		$this -> checkOutput("\x1b@String1231.2FooBar");
-    }
-
-    public function testTextObject() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> text(new DateTime());
-	}
-
-    public function testFeedDefault() {
-		$this -> printer -> feed();
-		$this -> checkOutput("\x1b@\x0a");
-    }
-
-    public function testFeed3Lines() {
-		$this -> printer -> feed(3);
-		$this -> checkOutput("\x1b@\x1bd\x03");
-    }
-
-    public function testFeedZero() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feed(0);
-    }
-
-    public function testFeedNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feed("ab");
-    }
-
-    public function testFeedTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feed(256);
-	}
-
-	/* Print mode */
-    public function testSelectPrintModeDefault() {
-		$this -> printer -> selectPrintMode();
-		$this -> checkOutput("\x1b@\x1b!\x00");
-    }
-
-	public function testSelectPrintModeAcceptedValues() {
-		/* This iterates over a bunch of numbers, figures out which
-           ones contain invalid flags, and checks that the driver
-           rejects those, but accepts the good inputs */
-		
-		for($i = -1; $i <= 256; $i++) {
-			$invalid = ($i < 0) || ($i > 255) || (($i & 2) == 2) || (($i & 4) == 4) || (($i & 64) == 64);
-			$failed = false;
-			try {
-				$this -> printer -> selectPrintMode($i);
-			} catch(Exception $e) {
-				$failed = true;
-			}
-			$this -> assertEquals($failed, $invalid);
-		}
-    }
-
-	/* Underline */
-    public function testSetUnderlineDefault() {
-		$this -> printer -> setUnderline();
-		$this -> checkOutput("\x1b@\x1b-\x01");
-    }
-
-    public function testSetUnderlineOff() {
-		$this -> printer -> setUnderline(Escpos::UNDERLINE_NONE);
-		$this -> checkOutput("\x1b@\x1b-\x00");
-    }
-
-    public function testSetUnderlineOn() {
-		$this -> printer -> setUnderline(Escpos::UNDERLINE_SINGLE);
-		$this -> checkOutput("\x1b@\x1b-\x01");
-    }
-
-    public function testSetUnderlineDbl() {
-		$this -> printer -> setUnderline(Escpos::UNDERLINE_DOUBLE);
-		$this -> checkOutput("\x1b@\x1b-\x02");
-    }
-
-    public function testSetUnderlineAcceptedValues() {
-		$this -> printer -> setUnderline(0);
-		$this -> printer -> setUnderline(1);
-		$this -> printer -> setUnderline(2);
-		/* These map to 0 & 1 for interchangeability with setEmphasis */
-		$this -> printer -> setUnderline(true);
-		$this -> printer -> setUnderline(false);
-		$this -> checkOutput("\x1b@\x1b-\x00\x1b-\x01\x1b-\x02\x1b-\x01\x1b-\x00");
-	}
-
-    public function testSetUnderlineTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setUnderline(3);
-	}
-
-    public function testSetUnderlineNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setUnderline(-1);
-	}
-
-    public function testSetUnderlineNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setUnderline("Hello");
-	}
-
-	/* Emphasis */
-    public function testSetEmphasisDefault() {
-		$this -> printer -> setEmphasis();
-		$this -> checkOutput("\x1b@\x1bE\x01");
-    }
-
-    public function testSetEmphasisOn() {
-		$this -> printer -> setEmphasis(true);
-		$this -> checkOutput("\x1b@\x1bE\x01");
-    }
-
-    public function testSetEmphasisOff() {
-		$this -> printer -> setEmphasis(false);
-		$this -> checkOutput("\x1b@\x1bE\x00");
-    }
-
-    public function testSetEmphasisNonBoolean() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setEmphasis(7);
-	}
-
-	/* Double strike */
-    public function testSetDoubleStrikeDefault() {
-		$this -> printer -> setDoubleStrike();
-		$this -> checkOutput("\x1b@\x1bG\x01");
-    }
-
-    public function testSetDoubleStrikeOn() {
-		$this -> printer -> setDoubleStrike(true);
-		$this -> checkOutput("\x1b@\x1bG\x01");
-    }
-
-    public function testSetDoubleStrikeOff() {
-		$this -> printer -> setDoubleStrike(false);
-		$this -> checkOutput("\x1b@\x1bG\x00");
-    }
-
-    public function testSetDoubleStrikeNonBoolean() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setDoubleStrike(4);
-	}
-
-	/* Font */
-	public function testSetFontDefault() {
-		$this -> printer -> setFont();
-		$this -> checkOutput("\x1b@\x1bM\x00");
-	}
-
-	public function testSetFontAcceptedValues() {
-		$this -> printer -> setFont(Escpos::FONT_A);
-		$this -> printer -> setFont(Escpos::FONT_B);
-		$this -> printer -> setFont(Escpos::FONT_C);
-		$this -> checkOutput("\x1b@\x1bM\x00\x1bM\x01\x1bM\x02");
-	}
-
-	public function testSetFontNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setFont(-1);
-	}
-
-
-	public function testSetFontTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setFont(3);
-	}
-
-	public function testSetFontNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setFont('hello');
-	}
-
-	/* Justification */
-	public function testSetJustificationDefault() {
-		$this -> printer -> setJustification();
-		$this -> checkOutput("\x1b@\x1ba\x00");
-	}
-
-	public function testSetJustificationLeft() {
-		$this -> printer -> setJustification(Escpos::JUSTIFY_LEFT);
-		$this -> checkOutput("\x1b@\x1ba\x00");
-	}
-
-	public function testSetJustificationRight() {
-		$this -> printer -> setJustification(Escpos::JUSTIFY_RIGHT);
-		$this -> checkOutput("\x1b@\x1ba\x02");
-	}
-
-	public function testSetJustificationCenter() {
-		$this -> printer -> setJustification(Escpos::JUSTIFY_CENTER);
-		$this -> checkOutput("\x1b@\x1ba\x01");
-	}
-
-	public function testSetJustificationNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setJustification(-1);
-	}
-
-
-	public function testSetJustificationTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setFont(3);
-	}
-
-	public function testSetJustificationNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setJustification('hello');
-	}
-
-	/* Reverse feed */
-	public function testFeedReverseDefault() {
-		$this -> printer -> feedReverse();
-		$this -> checkOutput("\x1b@\x1be\x01");
-	}
-
-	public function testFeedReverse3() {
-		$this -> printer -> feedReverse(3);
-		$this -> checkOutput("\x1b@\x1be\x03");
-	}
-
-	public function testFeedReverseNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feedReverse(-1);
-	}
-
-	public function testFeedReverseTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feedReverse(256);
-	}
-
-	public function testFeedReverseNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> feedReverse('hello');
-	}
-
-	/* Cut */
-	public function testCutDefault() {
-		// TODO check what the accepted range of values should be for $line
-		// cut($mode = self::CUT_FULL, $lines = 3)
-		$this -> printer -> cut();
-		$this -> checkOutput("\x1b@\x1dVA\x03");
-	}
-
-	/* Set barcode height */
-	public function testSetBarcodeHeightDefault() {
-		$this -> printer -> setBarcodeHeight();
-		$this -> checkOutput("\x1b@\x1dh\x08");
-	}
-
-	public function testBarcodeHeight10() {
-		$this -> printer -> setBarcodeHeight(10);
-		$this -> checkOutput("\x1b@\x1dh\x0a");
-	}
-
-	public function testSetBarcodeHeightNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeHeight(-1);
-	}
-
-	public function testSetBarcodeHeightTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeHeight(256);
-	}
-
-	public function tesSetBarcodeHeightNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeHeight('hello');
-	}
-
-	/* Barcode text position */
-	public function testSetBarcodeTextPositionDefault() {
-		$this -> printer -> setBarcodeTextPosition();
-		$this -> checkOutput("\x1b@\x1dH\x00");
-	}
-	
-	public function testSetBarcodeTextPositionBelow() {
-		$this -> printer -> setBarcodeTextPosition(Escpos::BARCODE_TEXT_BELOW);
-		$this -> checkOutput("\x1b@\x1dH\x02");
-	}
-
-	public function testSetBarcodeTextPositionBoth() {
-		$this -> printer -> setBarcodeTextPosition(Escpos::BARCODE_TEXT_BELOW | Escpos::BARCODE_TEXT_ABOVE);
-		$this -> checkOutput("\x1b@\x1dH\x03");
-	}
-	
-	public function testSetBarcodeTextPositionNegative() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeTextPosition(-1);
-	}
-	
-	public function testSetBarcodeTextPositionTooLarge() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeTextPosition(4);
-	}
-	
-	public function tesSetBarcodeTextPositionNonInteger() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setBarcodeTextPosition('hello');
-	}
-
-	/* Barcode - UPC-A */
-	public function testBarcodeUpcaNumeric11Char() {
-		$this -> printer -> barcode("01234567890", Escpos::BARCODE_UPCA);
-		$this -> checkOutput("\x1b@\x1dkA\x0b01234567890");
-	}
-	
-	public function testBarcodeUpcaNumeric12Char() {
-		$this -> printer -> barcode("012345678901", Escpos::BARCODE_UPCA);
-		$this -> checkOutput("\x1b@\x1dkA\x0c012345678901");
-	}
-	
-	public function testBarcodeUpcaNumeric13Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("0123456789012", Escpos::BARCODE_UPCA);
-	}
-	
-	public function testBarcodeUpcaNonNumeric12Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("A12345678901", Escpos::BARCODE_UPCA);
-	}
-
-	/* Barcode - UPC-E */
-	public function testBarcodeUpceNumeric6Char() {
-		$this -> printer -> barcode("123456", Escpos::BARCODE_UPCE);
-		$this -> checkOutput("\x1b@\x1dkB\x06123456");
-	}
-
-	public function testBarcodeUpceNumeric7Char() {
-		$this -> printer -> barcode("0123456", Escpos::BARCODE_UPCE);
-		$this -> checkOutput("\x1b@\x1dkB\x070123456");
-	}
-	
-	public function testBarcodeUpceNumeric8Char() {
-		$this -> printer -> barcode("01234567", Escpos::BARCODE_UPCE);
-		$this -> checkOutput("\x1b@\x1dkB\x0801234567");
-	}
-	
-	public function testBarcodeUpceNumeric11Char() {
-		$this -> printer -> barcode("01234567890", Escpos::BARCODE_UPCE);
-		$this -> checkOutput("\x1b@\x1dkB\x0b01234567890");
-	}
-	
-	public function testBarcodeUpceNumeric12Char() {
-		$this -> printer -> barcode("012345678901", Escpos::BARCODE_UPCE);
-		$this -> checkOutput("\x1b@\x1dkB\x0c012345678901");
-	}
-	
-	public function testBarcodeUpceNumeric9Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("012345678", Escpos::BARCODE_UPCE);
-	}
-	
-	public function testBarcodeUpceNonNumeric12Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("A12345678901", Escpos::BARCODE_UPCE);
-	}
-
-	/* Barcode - JAN13 */
-	public function testBarcodeJan13Numeric12Char() {
-		$this -> printer -> barcode("012345678901", Escpos::BARCODE_JAN13);
-		$this -> checkOutput("\x1b@\x1dkC\x0c012345678901");
-	}
-	
-	public function testBarcodeJan13Numeric13Char() {
-		$this -> printer -> barcode("0123456789012", Escpos::BARCODE_JAN13);
-		$this -> checkOutput("\x1b@\x1dkC\x0d0123456789012");
-	}
-	
-	public function testBarcodeJan13Numeric11Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("01234567890", Escpos::BARCODE_JAN13);
-	}
-	
-	public function testBarcodeJan13NonNumeric13Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("A123456789012", Escpos::BARCODE_JAN13);
-	}
-	
-	/* Barcode - JAN8 */
-	public function testBarcodeJan8Numeric7Char() {
-		$this -> printer -> barcode("0123456", Escpos::BARCODE_JAN8);
-		$this -> checkOutput("\x1b@\x1dkD\x070123456");
-	}
-	
-	public function testBarcodeJan8Numeric8Char() {
-		$this -> printer -> barcode("01234567", Escpos::BARCODE_JAN8);
-		$this -> checkOutput("\x1b@\x1dkD\x0801234567");
-	}
-	
-	public function testBarcodeJan8Numeric9Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("012345678", Escpos::BARCODE_JAN8);
-	}
-	
-	public function testBarcodeJan8NonNumeric8Char() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("A1234567", Escpos::BARCODE_JAN8);
-	}
-	
-	/* Barcode - Code39 */
-	public function testBarcodeCode39AsDefault() {
-		$this -> printer -> barcode("1234");
-		$this -> checkOutput("\x1b@\x1dkE\x041234");		
-	}
-
-	public function testBarcodeCode39Text() {
-		$this -> printer -> barcode("ABC 012", Escpos::BARCODE_CODE39);
-		$this -> checkOutput("\x1b@\x1dkE\x07ABC 012");
-	}
-	
-	public function testBarcodeCode39SpecialChars() {
-		$this -> printer -> barcode("$%+-./", Escpos::BARCODE_CODE39);
-		$this -> checkOutput("\x1b@\x1dkE\x06$%+-./");
-	}
-	
-	public function testBarcodeCode39Asterisks() {
-		$this -> printer -> barcode("*TEXT*", Escpos::BARCODE_CODE39);
-		$this -> checkOutput("\x1b@\x1dkE\x06*TEXT*");
-	}
-	
-	public function testBarcodeCode39AsterisksUnmatched() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("*TEXT", Escpos::BARCODE_CODE39);
-	}
-	
-	public function testBarcodeCode39AsteriskInText() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("12*34", Escpos::BARCODE_CODE39);
-	}
-	
-	public function testBarcodeCode39Lowercase() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("abcd", Escpos::BARCODE_CODE39);
-	}
-	
-	public function testBarcodeCode39Empty() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("**", Escpos::BARCODE_CODE39);
-	}
-
-	/* Barcode - ITF */
-	public function testBarcodeItfNumericEven() {
-		$this -> printer -> barcode("1234", Escpos::BARCODE_ITF);
-		$this -> checkOutput("\x1b@\x1dkF\x041234");		
-	}
-	
-	public function testBarcodeItfNumericOdd() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("123", Escpos::BARCODE_ITF);
-	}
-	
-	public function testBarcodeItfNonNumericEven() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("A234", Escpos::BARCODE_ITF);
-	}
-
-	/* Barcode - Codabar */
-	public function testBarcodeCodabarNumeric() {
-		$this -> printer -> barcode("A012345A", Escpos::BARCODE_CODABAR);
-		$this -> checkOutput("\x1b@\x1dkG\x08A012345A");
-	}
-	
-	public function testBarcodeCodabarSpecialChars() {
-		$this -> printer -> barcode("A012$+-./:A", Escpos::BARCODE_CODABAR);
-		$this -> checkOutput("\x1b@\x1dkG\x0bA012$+-./:A");
-	}
-	
-	public function testBarcodeCodabarNotWrapped() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("012345", Escpos::BARCODE_CODABAR);
-	}
-	
-	public function testBarcodeCodabarStartStopWrongPlace() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("012A45", Escpos::BARCODE_CODABAR);
-	}
-
-	/* Barcode - Code93 */
-	public function testBarcodeCode93Valid() {
-		$this -> printer -> barcode("012abcd", Escpos::BARCODE_CODE93);
-		$this -> checkOutput("\x1b@\x1dkH\x07012abcd");
-	}
-
-	public function testBarcodeCode93Empty() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("", Escpos::BARCODE_CODE93);
-	}
-
-	/* Barcode - Code128 */
-	public function testBarcodeCode128ValidA() {
-		$this -> printer -> barcode("{A" . "012ABCD", Escpos::BARCODE_CODE128);
-		$this -> checkOutput("\x1b@\x1dkI\x09{A012ABCD");
-	}
-
-	public function testBarcodeCode128ValidB() {
-		$this -> printer -> barcode("{B" . "012ABCDabcd", Escpos::BARCODE_CODE128);
-		$this -> checkOutput("\x1b@\x1dkI\x0d{B012ABCDabcd");
-	}
-	
-	public function testBarcodeCode128ValidC() {
-		$this -> printer -> barcode("{C" . chr ( 21 ) . chr ( 32 ) . chr ( 43 ), Escpos::BARCODE_CODE128);
-		$this -> checkOutput("\x1b@\x1dkI\x05{C\x15 +");
-	}
-	
-	public function testBarcodeCode128NoCodeSet() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> barcode("ABCD", Escpos::BARCODE_CODE128);
-	}
-	
-	/* Pulse */
-	function testPulseDefault() {
-		$this -> printer -> pulse();
-		$this -> checkOutput("\x1b@\x1bp0<x");
-	}
-
-	function testPulse1() {
-		$this -> printer -> pulse(1);
-		$this -> checkOutput("\x1b@\x1bp1<x");
-	}
-	
-	function testPulseEvenMs() {
-		$this -> printer -> pulse(0, 2, 2);
-		$this -> checkOutput("\x1b@\x1bp0\x01\x01");
-	}
-	
-	function testPulseOddMs() {
-		$this -> printer -> pulse(0, 3, 3); // Should be rounded down and give same output
-		$this -> checkOutput("\x1b@\x1bp0\x01\x01");
-	}
-	
-	function testPulseTooHigh() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> pulse(0, 512, 2);
-	}
-	
-	function testPulseTooLow() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> pulse(0, 0, 2);
-	}
-	
-	function testPulseNotANumber() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> pulse("fish");
-	}
-	
-	/* Set reverse */
-    public function testSetReverseColorsDefault() {
-		$this -> printer -> setReverseColors();
-		$this -> checkOutput("\x1b@\x1dB\x01");
-    }
-
-    public function testSetReverseColorsOn() {
-		$this -> printer -> setReverseColors(true);
-		$this -> checkOutput("\x1b@\x1dB\x01");
-    }
-
-    public function testSetReverseColorsOff() {
-		$this -> printer -> setReverseColors(false);
-		$this -> checkOutput("\x1b@\x1dB\x00");
-    }
-
-    public function testSetReverseColorsNonBoolean() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setReverseColors(7);
-	}
-
-	/* Bit image print */
-	public function testBitImageBlack() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_black.png");
-		$this -> printer -> bitImage($img);
-		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x01\x00\x80");
-	}
-
-	public function testBitImageWhite() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_white.png");
-		$this -> printer -> bitImage($img);
-		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x01\x00\x00");
-	}
-	
-	public function testBitImageBoth() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/black_white.png");
-		$this -> printer -> bitImage($img);
-		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x02\x00\xc0\x00");
-	}
-	
-	public function testBitImageTransparent() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/black_transparent.png");
-		$this -> printer -> bitImage($img);
-		$this -> checkOutput("\x1b@\x1dv0\x00\x01\x00\x02\x00\xc0\x00");
-	}
-	
-	/* Graphics print */
-	public function testGraphicsWhite() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_white.png");
-		$this -> printer -> graphics($img);
-		$this -> checkOutput("\x1b@\x1d(L\x0b\x000p0\x01\x011\x01\x00\x01\x00\x00\x1d(L\x02\x0002");
-	}
-	
-	public function testGraphicsBlack() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/canvas_black.png");
-		$this -> printer -> graphics($img);
-		$this -> checkOutput("\x1b@\x1d(L\x0b\x000p0\x01\x011\x01\x00\x01\x00\x80\x1d(L\x02\x0002");
-	}
-		
-	public function testGraphicsBoth() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/black_white.png");
-		$this -> printer -> graphics($img);
-		$this -> checkOutput("\x1b@\x1d(L\x0c\x000p0\x01\x011\x02\x00\x02\x00\xc0\x00\x1d(L\x02\x0002");
-	}
-	
-	public function testGraphicsTransparent() {
-		$this -> requireGraphicsLibrary();
-		$img = new EscposImage(dirname(__FILE__)."/resources/black_transparent.png");
-		$this -> printer -> graphics($img);
-		$this -> checkOutput("\x1b@\x1d(L\x0c\x000p0\x01\x011\x02\x00\x02\x00\xc0\x00\x1d(L\x02\x0002");
-	}
-
-	/* QR code */
-	public function testQRCodeDefaults() {
-		// Test will fail if default values change
-		$this -> printer -> qrCode("1234");
-		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
-	}
-	
-	public function testQRCodeDefaultsAreCorrect() {
-		// Below tests assume that defaults are as written here (output string should be same as above)
-		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 3, Escpos::QR_MODEL_2);
-		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
-	}
-	
-	public function testQRCodeEmpty() {
-		$this -> printer -> qrCode('');
-		$this -> checkOutput("\x1b@"); // No commands actually sent
-	}
-	
-	public function testQRCodeChangeEC() {
-		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_H);
-		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E3\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
-	}
-	
-	public function testQRCodeChangeSize() {
-		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 7);
-		$this -> checkOutput("\x1b@\x1d(k\x04\x001A2\x00\x1d(k\x03\x001C\x07\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
-	}
-	
-	public function testQRCodeChangeModel() {
-		$this -> printer -> qrCode("1234", Escpos::QR_ECLEVEL_L, 3, Escpos::QR_MODEL_1);
-		$this -> checkOutput("\x1b@\x1d(k\x04\x001A1\x00\x1d(k\x03\x001C\x03\x1d(k\x03\x001E0\x1d(k\x07\x001P01234\x1d(k\x03\x001Q0");
-	}
-
-	/* Feed form - Required on page-mode only printers */
-	public function testFeedForm() {
-		$this -> printer -> feedForm();
-		$this -> checkOutput("\x1b@\x0c");
-	}
-	
-	/* Get status  */
-	public function testGetStatus() {
-		$this -> markTestIncomplete("Status check test code not implemented.");
-		// TODO some unit testing here on statuses
-		// $a = $this -> printer -> getPrinterStatus(Escpos::STATUS_PRINTER);
-	}
-
-	/* Set text size  */
-	public function testSetTextSizeNormal() {
-		$this -> printer -> setTextSize(1, 1);
-		$this -> checkOutput("\x1b@\x1d!\x00");
-	}
-
-	public function testSetTextSizeWide() {
-		$this -> printer -> setTextSize(4, 1);
-		$this -> checkOutput("\x1b@\x1d!0");
-	}
-
-	public function testSetTextSizeNarrow() {
-		$this -> printer -> setTextSize(1, 4);
-		$this -> checkOutput("\x1b@\x1d!\x03");
-	}
-
-	public function testSetTextSizeLarge() {
-		$this -> printer -> setTextSize(4, 4);
-		$this -> checkOutput("\x1b@\x1d!3");
-	}
-
-	public function testSetTextSizeInvalid() {
-		$this -> setExpectedException('InvalidArgumentException');
-		$this -> printer -> setTextSize(0, 9);
-	}
-}
-
-/*
- * For testing that string-castable objects are handled
- */
-class FooBar {
-	private $foo;
-	public function __construct($foo) {
-		$this -> foo = $foo;
-	}
-	
-	public function __toString() {
-		return $this -> foo;
-	}
-}
-?>
diff --git a/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php b/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
deleted file mode 100644
index 53690483c7a..00000000000
--- a/htdocs/includes/escpos/test/unit/WindowsPrintConnectorTest.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-class WindowsPrintConnectorTest extends PHPUnit_Framework_TestCase {
-	private $connector;
-
-	public function testLptWindows() {
-		// Should attempt to send data to the local printer by writing to it
-		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> once())
-				-> method('runWrite')
-				-> with($this -> equalTo(''), $this -> equalTo("LPT1"));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testLptMac() {
-		// Cannot print to local printer on Mac with this connector
-		$this -> setExpectedException('BadMethodCallException');
-		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_MAC);
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testLptLinux() {
-		// Cannot print to local printer on Linux with this connector
-		$this -> setExpectedException('BadMethodCallException');
-		$connector = $this -> getMockConnector("LPT1", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testComWindows() {
-		// Simple file write
-		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> once())
-				-> method('runWrite')
-				-> with($this -> equalTo(''), $this -> equalTo("COM1"));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testComMac() {
-		// Cannot print to local printer on Mac with this connector
-		$this -> setExpectedException('BadMethodCallException');
-		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_MAC);
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testComLinux() {
-		// Cannot print to local printer on Linux with this connector
-		$this -> setExpectedException('BadMethodCallException');
-		$connector = $this -> getMockConnector("COM1", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testLocalShareWindows() {
-		$connector = $this -> getMockConnector("Printer", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> once())
-				-> method('runCopy')
-				-> with($this -> anything(), $this -> stringContains('\\Printer'));
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterWindows() {
-		$connector = $this -> getMockConnector("smb://example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> once())
-				-> method('runCopy')
-				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterWindowsUsername() {
-		$connector = $this -> getMockConnector("smb://bob@example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:bob\''));
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> once())
-				-> method('runCopy')
-				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterWindowsUsernameDomain() {
-		$connector = $this -> getMockConnector("smb://bob@example-pc/home/Printer", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:home\\bob\''));
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> once())
-				-> method('runCopy')
-				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterWindowsUsernamePassword() {
-		$connector = $this -> getMockConnector("smb://bob:secret@example-pc/Printer", WindowsPrintConnector::PLATFORM_WIN);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('net use \'\\\\example-pc\\Printer\' \'/user:bob\' \'secret\''));
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');	
-		$connector -> expects($this -> once())
-				-> method('runCopy')
-				-> with($this -> anything(), $this -> equalTo('\\\\example-pc\\Printer'));
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterMac() {
-		// Not implemented
-		$this -> setExpectedException('Exception');
-		$connector = $this -> getMockConnector("smb://Guest@example-pc/Printer", WindowsPrintConnector::PLATFORM_MAC);
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCommand');
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterLinux() {
-		$connector = $this -> getMockConnector("smb://example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -c \'print -\' -N'));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterLinuxUsername() {
-		$connector = $this -> getMockConnector("smb://bob@example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -U \'bob\' -c \'print -\' -N'));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterLinuxUsernameDomain() {
-		$connector = $this -> getMockConnector("smb://bob@example-pc/home/Printer", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' -U \'home\\bob\' -c \'print -\' -N'));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> finalize();
-	}
-
-	public function testSharedPrinterLinuxUsernamePassword() {
-		$connector = $this -> getMockConnector("smb://bob:secret@example-pc/Printer", WindowsPrintConnector::PLATFORM_LINUX);
-		$connector -> expects($this -> once())
-				-> method('runCommand')
-				-> with($this -> equalTo('smbclient \'//example-pc/Printer\' \'secret\' -U \'bob\' -c \'print -\''));
-		$connector -> expects($this -> exactly(0))
-				-> method('runCopy');
-		$connector -> expects($this -> exactly(0))
-				-> method('runWrite');
-		$connector -> finalize();
-	}
-
-	private function getMockConnector($path, $platform) {
-		$stub = $this -> getMockBuilder('WindowsPrintConnector')
-				-> setMethods(array('runCopy', 'runCommand', 'getCurrentPlatform', 'runWrite'))
-				-> disableOriginalConstructor()
-				-> getMock();
-		$stub -> method('runCommand')
-				-> willReturn(0);
-		$stub -> method('runCopy')
-				-> willReturn(true);
-		$stub -> method('runWrite')
-				-> willReturn(true);
-		$stub -> method('getCurrentPlatform')
-				-> willReturn($platform);
-		$stub -> __construct($path);
-		return $stub;
-	}
-
-	/**
-	 * Test for correct identification of bogus or non-supported Samba strings.
-	 */
-	public function testSambaRegex() {
-		$good = array("smb://foo/bar",
-				"smb://foo/bar baz",
-				"smb://bob@foo/bar",
-				"smb://bob:secret@foo/bar",
-				"smb://foo-computer/FooPrinter",
-				"smb://foo-computer/workgroup/FooPrinter",
-				"smb://foo-computer/Foo Printer");
-		$bad = array("",
-				"http://google.com",
-				"smb:/foo/bar",
-				"smb://",
-				"smb:///bar",
-				"smb://@foo/bar",
-				"smb://bob:@foo/bar",
-				"smb://:secret@foo/bar",
-				"smb://foo/bar/baz/quux",
-				"smb://foo-computer//FooPrinter");
-		foreach($good as $item) {
-			$this -> assertTrue(preg_match(WindowsPrintConnector::REGEX_SMB, $item) == 1, "Windows samba regex should pass '$item'.");
-		}
-		foreach($bad as $item) {
-			$this -> assertTrue(preg_match(WindowsPrintConnector::REGEX_SMB, $item) != 1, "Windows samba regex should fail '$item'.");
-		}
-	}
-}
diff --git a/htdocs/includes/escpos/test/unit/resources/black_transparent.gif b/htdocs/includes/escpos/test/unit/resources/black_transparent.gif
deleted file mode 100644
index 6c54bad9eea0d1cd39e55504d181b6607b6028d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmZ?wbhEHbWMW`q_`m=Kia%Kx85kHD6#of27o{eaq^2m8XO?6rxO@5rFzA33fs`{a
LF|!D<GFSrupd1TX

diff --git a/htdocs/includes/escpos/test/unit/resources/black_transparent.png b/htdocs/includes/escpos/test/unit/resources/black_transparent.png
deleted file mode 100644
index b43bbb85cc0977c1759d2a9f0fc6627ed4336ac2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`1|*BN@u~nRwj^(N7l!{JxM1({$v_d#0*}aI
z1_o|n5N2eUHAey{$X?><>&kwgnNLhfd<&=O9H5Y7iEBiObAE1aYF-J0b5UwyNotBh
zd1gt5g1e`0KzJjcI8YJ4r;B3<$MxitgoGdG8+aJ_#26XR&Dh)tlw$C7^>bP0l+XkK
D$`C0q

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.bmp b/htdocs/includes/escpos/test/unit/resources/black_white.bmp
deleted file mode 100644
index 0acbf66506f8ae152df4bfabc835e03505112878..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 138
ycmZ?r?P7p{Dj<~u#7t1k$RGih5CD?G+z<>F01{5_LB%jOu{6kBWbhvh5F!BXKMAt{

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.gif b/htdocs/includes/escpos/test/unit/resources/black_white.gif
deleted file mode 100644
index 0a044a671f59c3c4a5f859eb6a09a71d809be683..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmZ?wbhEHbWMW`q_`t{j1poj4SNzEWVlgQG6Lc<0O)N=GQ7F$W$xv|j^bKIp0m*=r
NGcYl;2(dC)0{}064pjgE

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.jpg b/htdocs/includes/escpos/test/unit/resources/black_white.jpg
deleted file mode 100644
index 6539cece59e6c5ce41bf50f1ced121096ead5aed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 175
zcmex=<NpH&0WUXCHwH#VCI%TGWcYuZ!I^=X2?RhSGZ3(_v48*v8yhPdCkGc7CkH1d
z7Y{!V7dIa_Cnv8UFCV{vfS>>ukC3pCfH06P@c#e<HwOa~0}~^oAjAJ73?dAS45)wu
qC@L+$z`%|w!OG4d5i#xZ|62?kj6fNChI*H08>52OWR?s5zX<@pgBjQW

diff --git a/htdocs/includes/escpos/test/unit/resources/black_white.png b/htdocs/includes/escpos/test/unit/resources/black_white.png
deleted file mode 100644
index 33ba331fa1e8642247b0cd1e48e03e7bb24a624b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 156
zcmeAS@N?(olHy`uVBq!ia0vp^Od!kwBL7~QRScv!3p^r$G`BDaGcwGYBLNg-FY)ws
zWxvnN$08&+x9_71P)M@GHKN2hKQ}iuuY|$5C^fMpHASI3vm`^o-P1Q9ypc~Fs7TDy
o#W95AdU65;{Q3Xio|&1MfuD`(|Am>%Vn7uPp00i_>zopr06?22>i_@%

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.bmp b/htdocs/includes/escpos/test/unit/resources/canvas_black.bmp
deleted file mode 100644
index 2ee723c59d87be01c0901a2662fc414e7898d904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmZ?r?PGv|E+AC{#Eft(0hV9^ljy{M1_lTMN&I(m4=Qdr^i?Bahn%QF>uW{_V`Jfl
cv@|t`v^2H_GiP$za9w9siRm{&HU*ox0Ab1$MF0Q*

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.gif b/htdocs/includes/escpos/test/unit/resources/canvas_black.gif
deleted file mode 100644
index 49b19dbc179f5995e4ff5338e7039d3a47b4a888..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZ?wbhEHbWMp7u_`t{j1poj4SNzEWVlgQG=l0A^Oi%SqOwUZt=1ot`%}um5&@(YL
UF*Rk-0jU6KV_;%(VPvod0K2{rbpQYW

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.jpg b/htdocs/includes/escpos/test/unit/resources/canvas_black.jpg
deleted file mode 100644
index d059f431b267596da878937214280915c89f51ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmZ9GK@P$|3<DinR!Mf-W?NptCpaKgf=}`l4m<+Ng`b4Y5yp~b`C!?f{()WB%L*bw
z2>!+y-7X048hz>mPHCTnRfR>gOhxmUMTR<zlUX$_^D^7gviTjEV~?o9A2`JF4-&2Y
Ox9|<zp5TPz&0k+u*%QkE

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_black.png b/htdocs/includes/escpos/test/unit/resources/canvas_black.png
deleted file mode 100644
index 52e6ba9ffd3ed0406bbd384e70e6b07587655808..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgLbVpxD28NCO+<y{TfqaEzk04(L
zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVS?>+a<gN$m8;K
zaSY+Oo(xpQz{J4#NO6xbkfmDU8c~vxSdwa$T$Bo=7>o=IO?3^7bqx(d49u-eEv*bK
owG9oe3=Ayq=dVT4kei>9nO2EggGbYKL7)Z(Pgg&ebxsLQ05fwqK>z>%

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.bmp b/htdocs/includes/escpos/test/unit/resources/canvas_white.bmp
deleted file mode 100644
index e47e0ef617583acde08ae6d8ddf8045fb1a4e55e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmZ?r?PGv|E+AC{#Eft(0hV9^ljy{M1_lTMN&I(m4=Qdr^i?Bahn%QF>uW{_V`Jfl
hv@|t`v^2H_GiP$za9w9siRm{&HU-_>|Ns9p003&i7eW94

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.gif b/htdocs/includes/escpos/test/unit/resources/canvas_white.gif
deleted file mode 100644
index 7881ce629acf8d6918eb5ac07169bc67b99a904b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72
zcmZ?wbhEHbWMp7u_`t{j1poj4SNzEWVlgQG=l0A^Oi%SqOwUZt=1ot`%}um5&@(YL
UF*Rk-0jU6KV_;(PVPvod0K480eE<Le

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.jpg b/htdocs/includes/escpos/test/unit/resources/canvas_white.jpg
deleted file mode 100644
index 516a965c73e092c97365aaf294a3572c47eedbf3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 160
zcmZ9Gu@1sO3_~4SPD$?C=34%T0jUzqd@uta0d#;r36~L`CCl<)*&qIaUDopoB0>nh
z;e>7%gm;ZT^#P}}Pr|CgB3h=RdCVe19mdJ5nwEK)ZE4y3hRm@?RN;3VV)+M&*8W@g
M3*4UIi0j**UsypDH2?qr

diff --git a/htdocs/includes/escpos/test/unit/resources/canvas_white.png b/htdocs/includes/escpos/test/unit/resources/canvas_white.png
deleted file mode 100644
index 4231a4bb5400c5554d146b0f8b32b717c109c1bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^j35jm7|ip2ssJgLbVpxD28NCO+<y{TfqaEzk04(L
zhAK4%hK3dfhF?ITh8GMBr3MTPuM!v-tY$DUh!@P+6=(yLU`q0KcVS?>+a<gN$m8;K
zaSY+Oo}2+>H!(Ecb<X+%WT}?8MwFx^mZVxG7o`Fz1|tJQQ(XgNT|<Kq19K}=ODjW5
oZ9_vV0|U$Z`D;-$<mRVjrd8tB;L&tl5U7E{)78&qol`;+0O!&<)c^nh

diff --git a/htdocs/includes/escpos/test/unit/resources/demo.php b/htdocs/includes/escpos/test/unit/resources/demo.php
deleted file mode 100644
index 67ea53c1bfd..00000000000
--- a/htdocs/includes/escpos/test/unit/resources/demo.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$im = new Imagick();
-try {
-	$im -> readImage("doc.pdf[5]");
-	$im -> destroy();
-} catch(ImagickException $e) {
-	echo "Error: " . $e -> getMessage() . "\n";
-}
-
-$im = new Imagick();
-try {
-	ob_start();
-	@$im -> readImage("doc.pdf[5]");
-	ob_end_clean();
-	$im -> destroy();
-} catch(ImagickException $e) {
-	echo "Error: " . $e -> getMessage() . "\n";
-}
-
diff --git a/htdocs/includes/escpos/test/unit/resources/doc.pdf b/htdocs/includes/escpos/test/unit/resources/doc.pdf
deleted file mode 100644
index 22247b918dbbcbfb0981d9442c966c99a47361b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6681
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
bQ5=#CZ9g8L&gBcKi39DzR8)+usIdP4$C)m7

diff --git a/htdocs/includes/mike42/escpos-php b/htdocs/includes/mike42/escpos-php
new file mode 160000
index 00000000000..0564ff94de4
--- /dev/null
+++ b/htdocs/includes/mike42/escpos-php
@@ -0,0 +1 @@
+Subproject commit 0564ff94de45564221eca99c4cd5ab24492894c2

From e7ecad2912aef040310728a2283f9290ff9bcc6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 21:11:45 +0100
Subject: [PATCH 160/216] Add function getNomUrl on skeleton class.

---
 dev/skeletons/skeleton_class.class.php | 38 ++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php
index f9ef2d39f58..2e737b8e87f 100644
--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.class.php
@@ -426,6 +426,44 @@ class Skeleton_Class extends CommonObject
 		}
 	}
 
+	/**
+	 *  Return a link to the user card (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;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+
+        $result = '';
+        $companylink = '';
+
+        $label = '<u>' . $langs->trans("MyModule") . '</u>';
+        $label.= '<div width="100%">';
+        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+
+        $link = '<a href="'.DOL_URL_ROOT.'/mymodule/card.php?id='.$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), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
+            if ($withpicto != 2) $result.=' ';
+		}
+		$result.= $link . $this->ref . $linkend;
+		return $result;
+	}
 	
 	/**
 	 *  Retourne le libelle du status d'un user (actif, inactif)

From e689e9ed76cf196f42dbceb22883dbef554398f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 21:33:05 +0100
Subject: [PATCH 161/216] Debug generator de code

---
 dev/skeletons/build_class_from_table.php |  2 +-
 dev/skeletons/skeleton_card.php          | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 65b6c023b89..6025f6a1f4e 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -639,7 +639,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>".$prop['field']."</td></tr>';\n";
+    	    $varprop.="print '<tr><td class=\"fieldrequired\">'.\$langs->trans(\"Field".$prop['field']."\").'</td><td>\$object->".$prop['field']."</td></tr>';\n";
     	}
     }
     $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_VIEW/', $varprop, $targetcontent);
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index 9cf6f26440c..22958c9c833 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -255,8 +255,10 @@ if ($action == 'create')
 // 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="add">';
+	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.'">';
 	
@@ -265,11 +267,13 @@ if (($id || $ref) && $action == 'edit')
 	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 '</td>';
+	print '</table>';
 	
 	dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"></div>';
+	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>';
 }
@@ -279,12 +283,14 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($id && (empty($action) || $action == 'view'))
 {
+	print load_fiche_titre($langs->trans("MyModule"));
+    
 	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_VIEW
-	print '</td>';
+	print '</table>';
 	
 	dol_fiche_end();
 

From 0433f203542c4ba470ed8fc87dd69edfc4357028 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Nov 2015 22:20:31 +0100
Subject: [PATCH 162/216] Code comment

---
 htdocs/install/mysql/tables/llx_c_field_list.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index 2884ae6c486..b22f98b52ec 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -14,6 +14,11 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
 --
+-- Change are done into list pages to use the new code to manage
+-- selection by users of fields. Once all changes are done with new
+-- code, we will be able to use this table to store the content of
+-- the $arrayfields table.
+-- Table not used / not required for the moment.
 -- ========================================================================
 
 create table llx_c_field_list

From bd0c7c433f6d7d6b38355a95947106d94610ba78 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 23:21:16 +0100
Subject: [PATCH 163/216] composer

---
 composer.lock | 67 ++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index f178ec4f419..4f7f131603d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f441e6348ae7862942693cab10810418",
+    "hash": "d88b5c84a9ea1af354d867ba2e2ab251",
     "packages": [
         {
             "name": "ccampbell/chromephp",
@@ -126,6 +126,64 @@
             "homepage": "https://github.com/firephp/firephp-core",
             "time": "2013-04-23 15:28:20"
         },
+        {
+            "name": "mike42/escpos-php",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mike42/escpos-php.git",
+                "reference": "0564ff94de45564221eca99c4cd5ab24492894c2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/0564ff94de45564221eca99c4cd5ab24492894c2",
+                "reference": "0564ff94de45564221eca99c4cd5ab24492894c2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.5.*"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roni Saha",
+                    "email": "roni.cse@gmail.com"
+                },
+                {
+                    "name": "Michael Billington",
+                    "email": "michael.billington@gmail.com"
+                },
+                {
+                    "name": "Gergely Radics",
+                    "email": "gerifield@ustream.tv"
+                },
+                {
+                    "name": "Warren Doyle",
+                    "email": "w.doyle@fuelled.co"
+                },
+                {
+                    "name": "vharo",
+                    "email": "vharo@geepok.com"
+                }
+            ],
+            "description": "Thermal receipt printer library, for use with ESC/POS compatible printers",
+            "homepage": "https://github.com/mike42/escpos-php",
+            "keywords": [
+                "ESC-POS",
+                "driver",
+                "escpos",
+                "print",
+                "receipt"
+            ],
+            "time": "2015-11-02 10:50:46"
+        },
         {
             "name": "mobiledetect/mobiledetectlib",
             "version": "2.8.3",
@@ -424,13 +482,16 @@
                 "pdf417",
                 "qrcode"
             ],
+            "abandoned": "tecnickcom/tcpdf",
             "time": "2015-01-28 18:51:40"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "mike42/escpos-php": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 729f1c9d3ab63ee4303fa16ebfd6ae3e980ad295 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Thu, 5 Nov 2015 23:50:13 +0100
Subject: [PATCH 164/216] composer

---
 composer.lock | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 4f7f131603d..47122ebe431 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,11 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
     "hash": "d88b5c84a9ea1af354d867ba2e2ab251",
+    "content-hash": "85e60ec7f8ab593387c7bd10d8db860d",
     "packages": [
         {
             "name": "ccampbell/chromephp",

From 2dc644da30a4671936bf04a6ddd90c6bbfd99fe4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 01:33:49 +0100
Subject: [PATCH 165/216] Debug Direct print module using the OAuth setup.

---
 htdocs/admin/oauth.php                        |  21 ++-
 htdocs/core/lib/geturl.lib.php                |   2 +-
 htdocs/core/modules/modOauth.class.php        |   2 +-
 .../modules/oauth/getgoogleoauthcallback.php  | 124 ++++++++++--------
 .../modules/printing/printgcp.modules.php     |   8 +-
 .../OAuth/Common/Storage/DoliStorage.php      |  22 +++-
 htdocs/langs/en_US/oauth.lang                 |   4 +
 htdocs/langs/en_US/printing.lang              |   8 +-
 htdocs/printing/admin/printing.php            |   7 +-
 9 files changed, 122 insertions(+), 76 deletions(-)

diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index aab05bd4c56..66878753b46 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -27,6 +27,13 @@ require '../main.inc.php';
 // required Class
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.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
+
+
 $langs->load("admin");
 $langs->load("oauth");
 
@@ -36,6 +43,8 @@ if (!$user->admin)
 
 $action = GETPOST('action', 'alpha');
 
+// Supported OAUTH
+$supportedoauth2array=array('OAUTH_GOOGLE_NAME');
 // API access parameters OAUTH
 $list = array (
             array(
@@ -297,11 +306,7 @@ print '<input type="hidden" name="action" value="update">';
 dol_fiche_head(array(), '', '', 0, 'technic');
 
 
-// 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
-
+print $langs->trans("ListOfSupportedOauthProviders").'<br><br>';
 
 print '<table class="noborder" width="100%">';
 
@@ -309,12 +314,16 @@ $var = true;
 
 foreach ($list as $key)
 {
+    $supported=0;
+    if (in_array($key[0], $supportedoauth2array)) $supported=1;
+    if (! $supported) continue;     // show only supported
+        
     print '<tr class="liste_titre">';
     // Api Name
     $label = $langs->trans($key[0]); 
     print '<td colspan="2">'.$label.'</td></tr>';
 
-    if (in_array($key[0], array('OAUTH_GOOGLE_NAME')))
+    if ($supported)
     {
         $redirect_uri=$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php';
         $var = !$var;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 682ddb1b1d1..83c67509dcc 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -101,7 +101,7 @@ function getURLContent($url,$postorget='GET',$param='',$followlocation=1,$addhea
     	curl_setopt($ch, CURLOPT_POST, 0);			// GET
     }
 
-    //if USE_PROXY constant set to TRUE in Constants.php, then only proxy will be enabled.
+    //if USE_PROXY constant set at begin of this method.
     if ($USE_PROXY)
     {
         dol_syslog("getURLContent set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index c77ab6de68e..35be63a5c59 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -51,7 +51,7 @@ class modOauth extends DolibarrModules
         $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 = "Enable OAuth authentication";
-        $this->version = 'development';    // 'development' or 'experimental' or 'dolibarr' or version
+        $this->version = 'dolibarr';    // 'development' or 'experimental' or 'dolibarr' or version
         $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;
diff --git a/htdocs/core/modules/oauth/getgoogleoauthcallback.php b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
index f1e0ddd03f3..e159198314c 100644
--- a/htdocs/core/modules/oauth/getgoogleoauthcallback.php
+++ b/htdocs/core/modules/oauth/getgoogleoauthcallback.php
@@ -30,14 +30,25 @@ use OAuth\Common\Consumer\Credentials;
 use OAuth\Common\Token\TokenInterface;
 use OAuth\OAuth2\Service\Google;
 
+// 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
+
+
+
 $action = GETPOST('action', 'alpha');
+$backtourl = GETPOST('backtourl', 'alpha');
+
 
 /**
  * Create a new instance of the URI class with the current URI, stripping the query string
  */
 $uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
-$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
-$currentUri->setQuery('');
+//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
+//$currentUri->setQuery('');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php');
+
 
 /**
  * Load the credential for the service
@@ -45,8 +56,15 @@ $currentUri->setQuery('');
 
 /** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
 $serviceFactory = new \OAuth\ServiceFactory();
+$httpClient = new \OAuth\Common\Http\Client\CurlClient();
+// TODO Set options for proxy and timeout
+// $params=array('CURLXXX'=>value, ...)
+//$httpClient->setCurlParameters($params);
+$serviceFactory->setHttpClient($httpClient);
+
 // Dolibarr storage
 $storage = new DoliStorage($db, $conf);
+
 // Setup the credentials for the requests
 $credentials = new Credentials(
     $conf->global->OAUTH_GOOGLE_ID,
@@ -54,6 +72,7 @@ $credentials = new Credentials(
     $currentUri->getAbsoluteUri()
 );
 
+
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 /** @var $apiService Service */
 // TODO remove hardcoded array
@@ -61,80 +80,71 @@ $apiService = $serviceFactory->createService('Google', $credentials, $storage, a
 
 // access type needed for google refresh token
 $apiService->setAccessType('offline');
-if ($action == 'delete') {
-    // delete token
-    llxHeader('',$langs->trans("OAuthSetup"));
 
-    $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-    print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
-    dol_fiche_head();
+$langs->load("oauth");
+
+
+/*
+ * Actions
+ */
+
+
+if ($action == 'delete') 
+{
     $storage->clearToken('Google');
-    dol_fiche_end();
+    
+    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+    
+    header('Location: ' . $backtourl);
+    exit();
+} 
 
+if (! empty($_GET['code']))     // We are coming from Google oauth page
+{
+    //llxHeader('',$langs->trans("OAuthSetup"));
 
-} elseif (! empty($_GET['code'])) {
-    llxHeader('',$langs->trans("OAuthSetup"));
+    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-    print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
-
-    dol_fiche_head();
+    //dol_fiche_head();
     // retrieve the CSRF state parameter
     $state = isset($_GET['state']) ? $_GET['state'] : null;
-    print '<table>';
-    // looking for a token already stored in db
-    //try {
-    //    $token = $storage->retrieveAccessToken('Google');
-    //    $old_token=1;
-    //} catch (Exception $e) {
-    //    $old_token=0;
-    //}
-    //if ($old_token==1) {
-    //    print '<tr><td>'.$langs->trans('OldTokenStored').'</td><td></td></tr>';
-    //    print '<tr><td><pre>'.print_r($token,true).'</pre></td></tr>';
-    //}
-    //$refreshtoken = $token->getRefreshToken();
+    //print '<table>';
 
     // This was a callback request from service, get the token
     try {
-        $apiService->requestAccessToken($_GET['code'], $state);
+        //var_dump($_GET['code']);
+        //var_dump($state);
+        //var_dump($apiService);      // OAuth\OAuth2\Service\Google
+        $token = $apiService->requestAccessToken($_GET['code'], $state);
+        
+        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');
     } catch (Exception $e) {
         print $e->getMessage();
     }
-    //print '<pre>'.print_r($apiService,true).'</pre>';
 
-    // retrieve new token in db
-    try {
-        $token = $storage->retrieveAccessToken('Google');
-        $new_token=1;
-    } catch (Exception $e) {
-        $new_token=0;
-    }
-    $newrefreshtoken = $token->getRefreshToken();
-    if (empty($newrefreshtoken) && ! empty($refreshtoken)) {
-        $token->setRefreshToken($refreshtoken);
-        $storage->storeAccessToken('Google', $token);
-    }
-    if ($new_token==1) {
-        print '<tr><td>'.$langs->trans('NewTokenStored').'</td><td></td></tr>';
-        print '<tr><td><pre>'.print_r($token,true).'</pre></td></tr>';
-    }
-    //print '<td><pre>'.print_r($token,true).'</pre></td>';
-    //$apiService->refreshAccessToken($token);
-    //print '<pre>'.print_r($apiService,true).'</pre>';
-    //$token = $storage->retrieveAccessToken('Google');
-    //print '<td><pre>'.print_r($token,true).'</pre></td>';
-    print '<td><a href="https://security.google.com/settings/security/permissions" target="_blank">Applications associées à votre compte</a></td>';
-    print '</table>';
-
-    dol_fiche_end();
-} else {
+    $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+    unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+    
+    header('Location: ' . $backtourl);
+    exit();
+}
+else 
+{
+    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+    
     $url = $apiService->getAuthorizationUri();
     // we go on google authorization page
     header('Location: ' . $url);
     exit();
 }
 
-llxFooter();
+
+/*
+ * View
+ */
+
+// No view at all, just actions
 
 $db->close();
+
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 7010ec7de78..aab1ae13bb6 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -87,6 +87,8 @@ class printing_printgcp extends PrintingDriver
             $this->errors[] = $e->getMessage();
             $token_ok = false;
         }
+        //var_dump($this->errors);exit;
+        
         $expire = false;
         // Is token expired or will token expire in the next 30 seconds
         if ($token_ok) {
@@ -116,12 +118,12 @@ class printing_printgcp extends PrintingDriver
                     $refreshtoken = $token->getRefreshToken();
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_REFRESH', 'info'=>((! empty($refreshtoken))?'Yes':'No'), 'type'=>'info');
                     $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRED', 'info'=>($expire?'Yes':'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(date("Y-m-d H:i:s", $token->getEndOfLife())), 'type'=>'info');
+                    $this->conf[] = array('varname'=>'PRINTGCP_TOKEN_EXPIRE_AT', 'info'=>(dol_print_date($token->getEndOfLife(), "dayhour")), 'type'=>'info');
                 }
                 if (!$storage->hasAccessToken('Google')) {
-                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php', 'type'=>'authlink');
+                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                 } else {
-                    $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete', 'type'=>'delete');
+                    $this->conf[] = array('varname'=>'PRINTGCP_DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/getgoogleoauthcallback.php?action=delete&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
                 }
             } else {
                 $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
index 2e4b9c195a2..0ce3abf39c1 100644
--- a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -86,6 +86,10 @@ class DoliStorage implements TokenStorageInterface
      */
     public function storeAccessToken($service, TokenInterface $token)
     {
+        //var_dump("storeAccessToken");
+        //var_dump($token);
+        dol_syslog("storeAccessToken");
+        
         $serializedToken = serialize($token);
         $this->tokens[$service] = $token;
 
@@ -95,6 +99,10 @@ class DoliStorage implements TokenStorageInterface
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
         $sql.= " WHERE service='".$service."' AND entity=1";
         $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_print_error($this->db);
+        }
         $obj = $this->db->fetch_array($resql);
         if ($obj) {
             // update
@@ -108,7 +116,8 @@ class DoliStorage implements TokenStorageInterface
             $sql.= " VALUES ('".$service."', '".$this->db->escape($serializedToken)."', 1)";
             $resql = $this->db->query($sql);
         }
-
+        //print $sql;
+        
         // allow chaining
         return $this;
     }
@@ -122,8 +131,13 @@ class DoliStorage implements TokenStorageInterface
         $sql = "SELECT token FROM ".MAIN_DB_PREFIX."oauth_token";
         $sql.= " WHERE service='".$service."'";
         $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_print_error($this->db);
+        }
         $result = $this->db->fetch_array($resql);
-        $token = unserialize($result[token]);
+        $token = unserialize($result['token']);
+        
         $this->tokens[$service] = $token;
 
         return is_array($this->tokens)
@@ -194,6 +208,10 @@ class DoliStorage implements TokenStorageInterface
         $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_state";
         $sql.= " WHERE service='".$service."' AND entity=1";
         $resql = $this->db->query($sql);
+        if (! $resql)
+        {
+            dol_print_error($this->db);
+        }
         $obj = $this->db->fetch_array($resql);
         if ($obj) {
             // update
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index ef58d605c49..4567af2a0b6 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -1,7 +1,11 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
 NoAccessToken=No token access saved.
+HasAccessToken=A token was generated and saved into database
+NewTokenStored=Token received ans saved
+TokenDeleted=Token deleted
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
+ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules than need OAuth2 authentication.
 OAUTH_AMAZON_NAME=Api Amazon
 OAUTH_AMAZON_ID=Api Amazon Id
 OAUTH_AMAZON_SECRET=Api Amazon Secret
diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index a4f9fe09e04..fa154976603 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -20,11 +20,13 @@ UserConf=Setup per user
 PRINTGCP=Google Cloud Print
 PRINTGCP_INFO=Google Api State
 PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print Token
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
 PRINTGCP_TOKEN_REFRESH=Token Refresh Present
 PRINTGCP_TOKEN_EXPIRED=Token Expired
 PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-RequestAccess=Request Access
+PRINTGCP_DELETE_TOKEN=Delete saved token
+RequestAccess=Click here to request access and receive a token to save
+DeleteAccess=Click here to delete token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
@@ -83,4 +85,4 @@ MEDIA_IPP_thermal=Thermal
 IPP_COLOR_print-black=BW Printer
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
-GoogleAuthConfigured=Google OAuth credentials found.
\ No newline at end of file
+GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
\ No newline at end of file
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index ac6f030ae16..ce87a5c7178 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -137,7 +137,8 @@ if ($mode == 'setup' && $user->admin)
         $classname = 'printing_'.$driver;
         $langs->load($driver);
         $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
+        //var_dump($printer);
+        
         $i=0;
         $submit_enabled=0;
         foreach ($printer->conf as $key)
@@ -157,14 +158,14 @@ if ($mode == 'setup' && $user->admin)
                 case "authlink":
                     print '<tr '.$bc[$var].'>';
                     print '<td>'.$langs->trans($key['varname']).'</td>';
-                    print '<td class="button"><a href="'.$key['link'].'">'.$langs->trans('RequestAccess').'</a></td>';
+                    print '<td><a class="button" href="'.$key['link'].'">'.$langs->trans('RequestAccess').'</a></td>';
                     print '<td>&nbsp;</td>';
                     print '</tr>'."\n";
                     break;
                 case "delete":
                     print '<tr '.$bc[$var].'>';
                     print '<td>'.$langs->trans($key['varname']).'</td>';
-                    print '<td class="button"><a href="'.$key['link'].'">'.$langs->trans('DeleteAccess').'</a></td>';
+                    print '<td><a class="button" href="'.$key['link'].'">'.$langs->trans('DeleteAccess').'</a></td>';
                     print '<td>&nbsp;</td>';
                     print '</tr>'."\n";
                     break;

From de8e7107ee42659c0f46fba61048058c5e36e89e Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Fri, 6 Nov 2015 01:53:20 +0100
Subject: [PATCH 166/216] Maintain origin_id and origin for copy document Fix
 any errors.

---
 htdocs/comm/propal/class/propal.class.php     | 21 ++++++++++++++-----
 htdocs/commande/class/commande.class.php      |  8 +++++--
 htdocs/compta/facture/class/facture.class.php |  8 ++++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 390e05363bb..f7a55bf6e02 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -375,13 +375,15 @@ class Propal extends CommonObject
      *		@param      int			$date_end         	End date of the line
      *      @param		array		$array_options		extrafields array
      * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+     *      @param		string		    $origin				'order', ...
+     *      @param		int			    $origin_id			Id of origin object
      *    	@return    	int         	    			>0 if OK, <0 if KO
      *
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin, $origin_id)
     {
-    	global $mysoc;
+    	global $mysoc, $conf, $langs;
 
         dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
@@ -499,6 +501,9 @@ class Propal extends CommonObject
 			$this->line->fk_fournprice = $fk_fournprice;
 			$this->line->pa_ht = $pa_ht;
 
+            $this->line->origin_id = $origin_id;
+            $this->line->origin = $origin;
+
             // Mise en option de la ligne
             if (empty($qty) && empty($special_code)) $this->line->special_code=3;
 
@@ -570,7 +575,8 @@ class Propal extends CommonObject
     {
         global $mysoc;
 
-        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$a_ht, type=$type, date_start=$date_start, date_end=$date_end");
+        dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+        txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
         // Clean parameters
@@ -894,7 +900,9 @@ class Propal extends CommonObject
                             $this->lines[$i]->date_start,
 							$this->lines[$i]->date_end,
 							$this->lines[$i]->array_options,
-							$this->lines[$i]->fk_unit
+							$this->lines[$i]->fk_unit,
+                            $this->element,
+                            $this->lines[$i]->id
 						);
 
                         if ($result < 0)
@@ -1384,7 +1392,10 @@ class Propal extends CommonObject
      */
     function update_extrafields($user)
     {
+        global $conf, $hookmanager;
+
     	$action='update';
+        $error = 0;
 
     	// Actions on extra fields (by external module or standard code)
     	// TODO le hook fait double emploi avec le trigger !!
@@ -2717,7 +2728,7 @@ class Propal extends CommonObject
      */
     function getNomUrl($withpicto=0,$option='', $get_params='')
     {
-        global $langs;
+        global $langs, $conf;
 
         $result='';
         $label = '<u>' . $langs->trans("ShowPropal") . '</u>';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 29be83ea3e2..1de3b25e5d2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -777,7 +777,9 @@ class Commande extends CommonOrder
                         $this->lines[$i]->pa_ht,
                     	$this->lines[$i]->label,
                     	$this->lines[$i]->array_options,
-	                    $this->lines[$i]->fk_unit
+	                    $this->lines[$i]->fk_unit,
+                        $this->element,
+                        $this->lines[$i]->id
                     );
                     if ($result < 0)
                     {
@@ -2321,6 +2323,7 @@ class Commande extends CommonOrder
 	function classifyBilled()
 	{
 		global $conf, $user, $langs;
+        $error = 0;
 
 		$this->db->begin();
 
@@ -2635,6 +2638,7 @@ class Commande extends CommonOrder
         global $hookmanager, $conf;
 
     	$action='create';
+        $error = 0;
 
     	// Actions on extra fields (by external module or standard code)
     	// TODO le hook fait double emploi avec le trigger !!
@@ -2871,7 +2875,7 @@ class Commande extends CommonOrder
      */
     function LibStatut($statut,$billed,$mode)
     {
-        global $langs;
+        global $langs, $conf;
         //print 'x'.$statut.'-'.$billed;
         if ($mode == 0)
         {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1462bf43a9b..8f8c9ae5d47 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -385,6 +385,8 @@ class Facture extends CommonInvoice
 				{
 					$newinvoiceline=$this->lines[$i];
 					$newinvoiceline->fk_facture=$this->id;
+                    $newinvoiceline->origin = $this->element;
+                    $newinvoiceline->origin_id = $this->lines[$i]->id;
 					if ($result >= 0 && ($newinvoiceline->info_bits & 0x01) == 0)	// We keep only lines with first bit = 0
 					{
 						// Reset fk_parent_line for no child products and special product
@@ -441,8 +443,8 @@ class Facture extends CommonInvoice
 							$this->lines[$i]->product_type,
 							$this->lines[$i]->rang,
 							$this->lines[$i]->special_code,
-							'',
-							0,
+                            $this->element,
+                            $this->lines[$i]->id,
 							$fk_parent_line,
 							$this->lines[$i]->fk_fournprice,
 							$this->lines[$i]->pa_ht,
@@ -873,7 +875,7 @@ class Facture extends CommonInvoice
 	 */
 	function getNomUrl($withpicto=0,$option='',$max=0,$short=0,$moretitle='')
 	{
-		global $langs;
+		global $langs, $conf;
 
 		$result='';
 

From 0f358eea49456451b9fb63206a5bef26d6560715 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 01:56:56 +0100
Subject: [PATCH 167/216] Fix path definition of thumbs with the new function

---
 htdocs/core/lib/functions.lib.php | 10 +++++-----
 htdocs/core/lib/images.lib.php    |  4 +++-
 htdocs/product/document.php       |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 727dd9d8a9e..be0523958bd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5225,17 +5225,17 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 /**
  * Return the filename of file to get the thumbs
  *
- * @param   string  $file           Original filename
+ * @param   string  $file           Original filename (full or relative path)
  * @param   string  $extName        Extension to differenciate thumb file name ('', '_small', '_mini')
- * @param   string  $extImgTarget   Force image format for thumbs. Use '' to keep same extension than original image.
- * @return  string                  New file name
+ * @param   string  $extImgTarget   Force image extension for thumbs. Use '' to keep same extension than original image.
+ * @return  string                  New file name (full or relative path, including the thumbs/)
  */
 function getImageFileNameForSize($file, $extName, $extImgTarget='')
 {
 	$dirName = dirname($file);
 	if ($dirName == '.') $dirName='';
 
-    $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
+    $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
 	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i',$file)?'.jpg':'');
@@ -5249,5 +5249,5 @@ function getImageFileNameForSize($file, $extName, $extImgTarget='')
     $subdir='';
     if ($extName) $subdir = 'thumbs/';
 
-    return $dirName.$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
+    return ($dirName?$dirName.'/':'').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index e61dc22eeb0..20a58d7021c 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -512,7 +512,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i','',$file);	// On enleve extension quelquesoit la casse
 	$fileName = basename($fileName);
-	$imgThumbName = $dirthumb.'/'.getImageFileNameForSize($file, $extName, $extImgTarget); // Chemin complet du fichier de la vignette
+	//$imgThumbName = $dirthumb.'/'.getImageFileNameForSize(basename($file), $extName, $extImgTarget);   // Full path of thumb file
+	$imgThumbName = getImageFileNameForSize($file, $extName, $extImgTarget);   // Full path of thumb file
+
 
 	// Check if permission are ok
 	//$fp = fopen($imgThumbName, "w");
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 3d5f40b768c..baf736b47e5 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -70,8 +70,8 @@ if ($id > 0 || ! empty($ref))
 {
     $result = $object->fetch($id, $ref);
 
-    if (! empty($conf->product->enabled)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product').dol_sanitizeFileName($object->ref);
-    elseif (! empty($conf->service->enabled)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product').dol_sanitizeFileName($object->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
 	{

From f9d0c887ae4735b825533e286e60bb6d7a551948 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 02:20:42 +0100
Subject: [PATCH 168/216] NEW Add a refresh button on page list of direct print
 jobs.

---
 htdocs/langs/en_US/printing.lang | 2 +-
 htdocs/printing/index.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/printing.lang b/htdocs/langs/en_US/printing.lang
index fa154976603..ab70ca671d7 100644
--- a/htdocs/langs/en_US/printing.lang
+++ b/htdocs/langs/en_US/printing.lang
@@ -3,7 +3,7 @@ Module64000Name=Direct Printing
 Module64000Desc=Enable Direct Printing System
 PrintingSetup=Setup of Direct Printing System
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing
+MenuDirectPrinting=Direct Printing jobs
 DirectPrint=Direct print
 ModuleDriverSetup=Setup Module Driver
 PrintingDriverDesc=Configuration variables for printing driver.
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index d263c60db8d..13e3883702d 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -27,7 +27,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/printing/modules_printing.php';
 
 llxHeader("",$langs->trans("Printing"));
 
-print load_fiche_titre($langs->trans("Printing"));
+print_barre_liste($langs->trans("Printing"), 0, $_SERVER["PHP_SELF"], '', '', '', '<a class="button" href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Refresh").'</a>', 0);
 
 print $langs->trans("DirectPrintingJobsDesc").'<br><br>';
 

From 6bf8b7f328f7c9fb8cecb32b38708d40f3764a96 Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <ssanchis@2byte.es>
Date: Fri, 6 Nov 2015 02:25:51 +0100
Subject: [PATCH 169/216] Default value origin_id and origin

---
 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 f7a55bf6e02..fcac4ba9de1 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -381,7 +381,7 @@ class Propal extends CommonObject
      *
      *    	@see       	add_product
      */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin, $origin_id)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0)
     {
     	global $mysoc, $conf, $langs;
 

From 67c9db6a5147181f73142ba08a0ec152c46d1ede Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 6 Nov 2015 09:36:16 +0100
Subject: [PATCH 170/216] [Qual] Uniformize code

---
 htdocs/categories/edit.php           |  4 +--
 htdocs/categories/traduction.php     |  4 +--
 htdocs/categories/viewcat.php        |  6 ++--
 htdocs/comm/action/rapport/index.php |  2 +-
 htdocs/comm/mailing/card.php         | 48 ++++++++++++++--------------
 htdocs/comm/mailing/cibles.php       |  8 ++---
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 0a13c3e7fab..9ffd7ac6401 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -101,12 +101,12 @@ if ($action == 'update' && $user->rights->categorie->creer)
 		}
 		else
 		{
-			setEventMessage($categorie->error, 'errors');
+			setEventMessages($categorie->error, $categorie->errors, 'errors');
 		}
 	}
 	else
 	{
-		setEventMessage($categorie->error, 'errors');
+		setEventMessages($categorie->error, $categorie->errors, 'errors');
 	}
 }
 
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 94570d48f3e..98f02c7a742 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -95,7 +95,7 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'add';
-		setEventMessage($object->error, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -128,7 +128,7 @@ $cancel != $langs->trans("Cancel") &&
 	else
 	{
 		$action = 'edit';
-		setEventMessage($object->error, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index bf86c1d496c..39f8d62fb7b 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -122,7 +122,7 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
 	}
 	else
 	{
-		setEventMessage($object->error, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -137,13 +137,13 @@ if ($type == Categorie::TYPE_PRODUCT && $elemid && $action == 'addintocategory'
 	$result=$object->add_type($newobject,$elementtype);
 	if ($result >= 0)
 	{
-		setEventMessage($langs->trans("WasAddedSuccessfully",$newobject->ref));
+		setEventMessages($langs->trans("WasAddedSuccessfully",$newobject->ref), null, 'mesgs');
 	}
 	else
 	{
 		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
-			setEventMessage($langs->trans("ObjectAlreadyLinkedToCategory"),'warnings');
+			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
 		}
 		else
 		{
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 24eb117684f..066df5fb39e 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -62,7 +62,7 @@ if ($action == 'builddoc')
 	$result=$cat->write_file(GETPOST('id','int'));
 	if ($result < 0)
 	{
-		setEventMessage($cat->error, 'errors');
+		setEventMessages($cat->error, $cat->errors, 'errors');
 	}
 }
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 2ff7796bfae..2a892033865 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -117,7 +117,7 @@ if (empty($reshook))
 	{
 		if (empty($_REQUEST["clone_content"]) && empty($_REQUEST["clone_receivers"]))
 		{
-			setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
 		else
 		{
@@ -129,7 +129,7 @@ if (empty($reshook))
 			}
 			else
 			{
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	    $action='';
@@ -141,14 +141,14 @@ if (empty($reshook))
 		if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 		{
 			// As security measure, we don't allow send from the GUI
-			setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
-			setEventMessage('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
-			setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
+			setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
+			setEventMessages('<textarea cols="70" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', null, 'warnings');
+			setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 			$action='';
 		}
 		else if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
 		{
-			setEventMessage($langs->trans("NotEnoughPermissions"), 'warnings');
+			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
 			$action='';
 		}
 		else
@@ -351,27 +351,27 @@ if (empty($reshook))
 				}
 				else
 				{
-					setEventMessage($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"));
+					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
 				}
 
 				// Loop finished, set global statut of mail
 				if ($nbko > 0)
 				{
 					$statut=2;	// Status 'sent partially' (because at least one error)
-					if ($nbok > 0) 	setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
-					else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+					else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
 				}
 				else
 				{
 					if ($nbok >= $num)
 					{
 						$statut=3;	// Send to everybody
-						setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
 					}
 					else
 					{
 						$statut=2;	// Status 'sent partially' (because not send to everybody)
-						setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok));
+						setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
 					}
 				}
 
@@ -443,11 +443,11 @@ if (empty($reshook))
 			$result=$mailfile->sendfile();
 			if ($result)
 			{
-				setEventMessage($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)));
+				setEventMessages($langs->trans("MailSuccessfulySent",$mailfile->getValidAddress($object->email_from,2),$mailfile->getValidAddress($object->sendto,2)), null, 'mesgs');
 			}
 			else
 			{
-				setEventMessage($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, 'errors');
+				setEventMessages($langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result, null, 'errors');
 			}
 
 			$action='';
@@ -488,7 +488,7 @@ if (empty($reshook))
 			$mesgs[] = $object->error;
 		}
 
-		setEventMessage($mesgs, 'errors');
+		setEventMessages($mesg, $mesgs, 'errors');
 		$action="create";
 	}
 
@@ -518,7 +518,7 @@ if (empty($reshook))
 			$mesg = $object->error;
 		}
 
-		setEventMessage($mesg, 'errors');
+		setEventMessages($mesg, $mesgs, 'errors');
 		$action="";
 	}
 
@@ -582,7 +582,7 @@ if (empty($reshook))
 				$mesgs[] =$object->error;
 			}
 
-			setEventMessage($mesgs, 'errors');
+			setEventMessages($mesg, $mesgs, 'errors');
 			$action="edit";
 		}
 		else
@@ -597,7 +597,7 @@ if (empty($reshook))
 		if ($object->id > 0)
 		{
 			$object->valid($user);
-			setEventMessage($langs->trans("MailingSuccessfullyValidated"));
+			setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 			exit;
 		}
@@ -628,7 +628,7 @@ if (empty($reshook))
 			}
 			else
 			{
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 			}
 		}
@@ -764,18 +764,18 @@ else
 					// You ensure that every user is using its own SMTP server.
 					$linktoadminemailbefore='<a href="'.DOL_URL_ROOT.'/admin/mails.php">';
 					$linktoadminemailend='</a>';
-					setEventMessage($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), 'warnings');
-					setEventMessage($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), 'warnings');
-					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessage($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), 'warnings');
+					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
+					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
+					if (! empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
 					$_GET["action"]='';
 				}
 				else if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
 				{
 					// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
 					// on affiche donc juste un message
-					setEventMessage($langs->trans("MailingNeedCommand"), 'warnings');
-					setEventMessage('<textarea cols="60" rows="'.ROWS_1.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.'</textarea>', 'warnings');
-					setEventMessage($langs->trans("MailingNeedCommand2"), 'warnings');
+					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');
+					setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
 					$_GET["action"]='';
 				}
 				else
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index cd3ff7b00ee..92b9f5446ca 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -100,24 +100,24 @@ if ($action == 'add')
 	}
 	if ($result > 0)
 	{
-		setEventMessage($langs->trans("XTargetsAdded",$result),'mesgs');
+		setEventMessages($langs->trans("XTargetsAdded",$result), null, 'mesgs');
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
 	if ($result == 0)
 	{
-		setEventMessage($langs->trans("WarningNoEMailsAdded"),'warnings');
+		setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
 	}
 	if ($result < 0)
 	{
-		setEventMessage($langs->trans("Error").($obj->error?' '.$obj->error:''),'errors');
+		setEventMessages($langs->trans("Error").($obj->error?' '.$obj->error:''), null, 'errors');
 	}
 }
 
 if (GETPOST('clearlist'))
 {
-	// Chargement de la classe
+	// Loading Class
 	$obj = new MailingTargets($db);
 	$obj->clear_target($id);
 

From 5f74a0f1c0e0ef0e7a8fe364db46fca97282e46e Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Fri, 6 Nov 2015 09:46:18 +0100
Subject: [PATCH 171/216] Traduction

---
 htdocs/admin/barcode.php                      | 2 +-
 htdocs/admin/facture.php                      | 2 +-
 htdocs/admin/payment.php                      | 2 +-
 htdocs/admin/security.php                     | 2 +-
 htdocs/comm/mailing/cibles.php                | 4 ++--
 htdocs/comm/mailing/index.php                 | 2 +-
 htdocs/core/modules/export/modules_export.php | 2 +-
 htdocs/core/modules/import/modules_import.php | 2 +-
 htdocs/exports/class/export.class.php         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 0a57508c271..fbaf68a96d9 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -162,7 +162,7 @@ foreach($dirbarcode as $reldir)
 					{
 						$filebis=$reg[1];
 
-						// Chargement de la classe de codage
+						// Loading encoding class
 						require_once $newdir.$file;
 						$classname = "mod".ucfirst($filebis);
 						$module = new $classname($db);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 46ca2b9fd87..b3f1d7a5d51 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -344,7 +344,7 @@ foreach ($dirmodels as $reldir)
                     $classname = preg_replace('/\-.*$/','',$classname);
                     if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php')
                     {
-                        // Chargement de la classe de numerotation
+                        // Charging the numbering class
                         require_once $dir.$filebis;
 
                         $module = new $classname($db);
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index c9bf610bd1b..07113231bcc 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -130,7 +130,7 @@ foreach ($dirmodels as $reldir)
                     $classname = preg_replace('/\-.*$/','',$classname);
                     if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php')
                     {
-                        // Chargement de la classe de numerotation
+                        // Charging the numbering class
                         require_once $dir.$filebis;
 
                         $module = new $classname($db);
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index a409d0c8b3f..ea81e63305e 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -221,7 +221,7 @@ if (is_resource($handle))
     {
         if (preg_match('/(modGeneratePass[a-z]+)\.class\.php/i',$file,$reg))
         {
-            // Chargement de la classe de numerotation
+            // Charging the numbering class
             $classname = $reg[1];
             require_once $dir.'/'.$file;
 
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 92b9f5446ca..ad4e3210619 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -80,7 +80,7 @@ if ($action == 'add')
 	    //print $dir."\n<br>";
 	    dol_syslog("Scan directory ".$dir." for modules");
 
-	    // Chargement de la classe
+	    // Loading Class
 	    $file = $dir."/".$module.".modules.php";
 	    $classname = "mailing_".$module;
 
@@ -267,7 +267,7 @@ if ($object->fetch($id) >= 0)
 			// Loop on each submodule
             foreach($modulenames as $modulename)
             {
-				// Chargement de la classe
+				// Loading Class
 				$file = $dir.$modulename.".modules.php";
 				$classname = "mailing_".$modulename;
 				require_once $file;
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 59753ee1904..5904bec0009 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -83,7 +83,7 @@ if (is_resource($handle))
                 $modulename=$reg[1];
        			if ($modulename == 'example') continue;
 
-                // Chargement de la classe
+                // Loading Class
                 $file = $dir."/".$modulename.".modules.php";
                 $classname = "mailing_".$modulename;
                 require_once $file;
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 113f35299ca..ee1c3b8e96c 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -64,7 +64,7 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
     			{
     				$moduleid=$reg[1];
 
-    				// Chargement de la classe
+    				// Loading Class
     				$file = $dir."/export_".$moduleid.".modules.php";
     				$classname = "Export".ucfirst($moduleid);
 
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 4fa5052a90a..a27b0fd9426 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -84,7 +84,7 @@ class ModeleImports
     			{
     				$moduleid=$reg[1];
 
-    				// Chargement de la classe
+    				// Loading Class
     				$file = $dir."/import_".$moduleid.".modules.php";
     				$classname = "Import".ucfirst($moduleid);
 
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 88e4ecc8596..3a3436c71a9 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -107,7 +107,7 @@ class Export
 
 						if ($enabled)
 						{
-							// Chargement de la classe
+							// Loading Class
 							$file = $dir.$modulename.".class.php";
 							$classname = $modulename;
 							require_once $file;

From f62d6d1950e8de706f7c27d0c67e8e119d35b224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 6 Nov 2015 11:08:41 +0100
Subject: [PATCH 172/216] FIX Product::updatePrice() now sets new prices to
 Product::multiprices_* arrays

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4c1fbc6c929..cd00f843f61 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1443,6 +1443,14 @@ class Product extends CommonObject
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
+				$this->multiprices[$level] = $price;
+				$this->multiprices_ttc[$level] = $price_ttc;
+				$this->multiprices_min[$level]= $price_min;
+				$this->multiprices_min_ttc[$level]= $price_min_ttc;
+				$this->multiprices_base_type[$level]= $newpricebase;
+				$this->multiprices_tva_tx[$level]= $newvat;
+				$this->multiprices_recuperableonly[$level]= $newnpr;
+
 				$this->price = $price;
 				$this->price_ttc = $price_ttc;
 				$this->price_min = $price_min;

From dac0a7bc501fe07380ff78be00d074c0ba2634bf Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 6 Nov 2015 11:09:54 +0100
Subject: [PATCH 173/216] Fix : finally, autofocus on product search field is a
 bad idea

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 10f5fc25695..575f11b90af 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1546,7 +1546,7 @@ class Form
             		print img_picto($langs->trans("Search"), 'search');
             	}
             }
-            print '<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' autofocus />';
+            print '<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
             if ($hidelabel == 3) {
             	print img_picto($langs->trans("Search"), 'search');
             }
@@ -1663,7 +1663,7 @@ class Form
             require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
             $num = $this->db->num_rows($result);
 
-            $out.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'" autofocus>';
+            $out.='<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
             $out.='<option value="0" selected>&nbsp;</option>';
 
             $i = 0;

From d3d62f7db521a1bbf2c805db1b6c53e12473d410 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 6 Nov 2015 11:11:23 +0100
Subject: [PATCH 174/216] FIX: #3913

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 19ee13533b0..a7d8573f6de 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -51,16 +51,16 @@ create table llx_overwrite_trans
   transvalue      text
 )ENGINE=innodb;
 
-ALTER TABLE llx_payment_salary ADD COLUMN datec datetime after tms;
+ALTER TABLE llx_payment_salary ADD COLUMN datec datetime AFTER tms;
 ALTER TABLE llx_payment_salary CHANGE COLUMN fk_user_creat fk_user_author integer;
 
-ALTER TABLE llx_adherent ADD COLUMN pass_crypted varchar(128) after pass;
+ALTER TABLE llx_adherent ADD COLUMN pass_crypted varchar(128) AFTER pass;
 
-ALTER TABLE llx_paiement ADD COLUMN ref varchar(30) NOT NULL AFTER rowid;
+ALTER TABLE llx_paiement ADD COLUMN ref varchar(30) NOT NULL DEFAULT '' AFTER rowid;
 
 ALTER TABLE llx_socpeople ADD COLUMN photo varchar(255) AFTER skype;
 
-ALTER TABLE llx_user_param MODIFY COLUMN value text NOT NULL;
+ALTER TABLE llx_user_param MODIFY COLUMN value text NOT NULL DEFAULT '';
 
 ALTER TABLE llx_expedition ADD COLUMN import_key varchar(14);
 ALTER TABLE llx_expedition ADD COLUMN extraparams varchar(255);
@@ -71,7 +71,7 @@ ALTER TABLE llx_prelevement_lignes MODIFY COLUMN code_banque varchar(128);
 ALTER TABLE llx_societe_rib MODIFY COLUMN code_banque varchar(128);
 
 ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30);
-ALTER TABLE llx_commande ADD COLUMN fk_warehouse integer DEFAULT NULL after fk_shipping_method;
+ALTER TABLE llx_commande ADD COLUMN fk_warehouse integer DEFAULT NULL AFTER fk_shipping_method;
 
 ALTER TABLE llx_ecm_directories MODIFY COLUMN fullpath varchar(750);
 ALTER TABLE llx_ecm_directories DROP INDEX idx_ecm_directories;
@@ -102,7 +102,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_fullpath(fullpath);
 
 
-ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 after tobuy;
+ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 AFTER tobuy;
 
 
 ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1;

From 11f0cad2ab09e23588a5a4f0318e24cca8a1a723 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 11:22:50 +0100
Subject: [PATCH 175/216] FIX #3912

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 19ee13533b0..ab833203759 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -18,6 +18,11 @@
 -- -- 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);
 
+
+-- Was done into a 3.8 fix, so we must do it also in 3.9 
+ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL DEFAULT 0 after country;
+
+
 -- Fix bad data
 update llx_opensurvey_sondage set format = 'D' where format = 'D+';
 update llx_opensurvey_sondage set format = 'A' where format = 'A+';

From 28b229c83a84c77fd296fdcd7642a31d5b3392a7 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 6 Nov 2015 11:24:52 +0100
Subject: [PATCH 176/216] FIX: #3916

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index a7d8573f6de..06aa013cea0 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -102,20 +102,20 @@ ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files (label, entity);
 --ALTER TABLE llx_ecm_files ADD UNIQUE INDEX uk_ecm_files_fullpath(fullpath);
 
 
-ALTER TABLE llx_product ADD COLUMN onportal tinyint DEFAULT 0 AFTER tobuy;
+ALTER TABLE llx_product ADD COLUMN onportal smallint DEFAULT 0 AFTER tobuy;
 
 
-ALTER TABLE llx_user ADD COLUMN employee tinyint DEFAULT 1;
+ALTER TABLE llx_user ADD COLUMN employee smallint DEFAULT 1;
 
 
 CREATE TABLE IF NOT EXISTS llx_c_hrm_function
 (
   rowid     integer     PRIMARY KEY,
-  pos   	tinyint DEFAULT 0 NOT NULL,
+  pos   	smallint DEFAULT 0 NOT NULL,
   code    	varchar(16) NOT NULL,
   label 	varchar(50),
-  c_level   tinyint DEFAULT 0 NOT NULL,
-  active  	tinyint DEFAULT 1  NOT NULL
+  c_level   smallint DEFAULT 0 NOT NULL,
+  active  	smallint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
 INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES(1,  5, 'EXECBOARD', 'Executive board', 0, 1);
@@ -131,10 +131,10 @@ INSERT INTO llx_c_hrm_function (rowid, pos, code, label, c_level, active) VALUES
 CREATE TABLE IF NOT EXISTS llx_c_hrm_department
 (
   rowid      	integer     PRIMARY KEY,
-  pos   		tinyint DEFAULT 0 NOT NULL,
+  pos   		smallint DEFAULT 0 NOT NULL,
   code    		varchar(16) NOT NULL,
   label 		varchar(50),
-  active  		tinyint DEFAULT 1  NOT NULL
+  active  		smallint DEFAULT 1  NOT NULL
 )ENGINE=innodb;
 
 INSERT INTO llx_c_hrm_department (rowid, pos, code, label, active) VALUES(1, 5,'MANAGEMENT', 'Management', 1);
@@ -173,7 +173,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
   tms				timestamp NOT NULL,
-  status            tinyint DEFAULT 1
+  status            smallint DEFAULT 1
 ) ENGINE=InnoDB;
 
 
@@ -255,7 +255,7 @@ CREATE TABLE llx_product_pricerules
     var_percent FLOAT NOT NULL, -- Price variation over based price
     var_min_percent FLOAT NOT NULL -- Min price discount over general price
 );
-ALTER TABLE llx_product ADD COLUMN price_autogen TINYINT(1) DEFAULT 0;
+ALTER TABLE llx_product ADD COLUMN price_autogen smallint DEFAULT 0;
 ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
 
 

From 610ef2359dc3f422491fa9e421c01b2b14b7b428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 6 Nov 2015 11:24:48 +0100
Subject: [PATCH 177/216] FIX #3914 Properties Product::multiprices_min and
 Product::multiprices_min_ttc, Product::url dynamically declared

Close #3914
---
 htdocs/product/class/product.class.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4c1fbc6c929..e7d43a180e0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -84,11 +84,13 @@ class Product extends CommonObject
 	//! Base price ('TTC' for price including tax or 'HT' for net price)
 	var $price_base_type;
 	//! Arrays for multiprices
-	var $multiprices=array();
-	var $multiprices_ttc=array();
-	var $multiprices_base_type=array();
-	var $multiprices_tva_tx=array();
-	var $multiprices_recuperableonly=array();
+	public $multiprices=array();
+	public $multiprices_ttc=array();
+	public $multiprices_base_type=array();
+	public $multiprices_min=array();
+	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();
@@ -125,6 +127,12 @@ class Product extends CommonObject
 
 	var $customcode;       // Customs code
 
+	/**
+	 * Product URL
+	 * @var string
+	 */
+	public $url;
+
 	//! Unites de mesure
 	var $weight;
 	var $weight_units;

From 996917926785f867ef013a56a685de1a333ca0c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 6 Nov 2015 11:35:39 +0100
Subject: [PATCH 178/216] NEW Deprecated Product::setPriceExpression. Use
 Product::update instead

---
 htdocs/product/class/product.class.php | 27 +++++---------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index cd00f843f61..d7e50da4e06 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -717,6 +717,7 @@ class Product extends CommonObject
 			$sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");
 	        $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
 	        $sql.= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);
+			$sql.= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');
 			$sql.= " WHERE rowid = " . $id;
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -1495,33 +1496,15 @@ class Product extends CommonObject
      *
      *  @param  int     $expression_id	Expression
      *  @return int                 	<0 if KO, >0 if OK
+	 * @deprecated Use Product::update instead
      */
     function setPriceExpression($expression_id)
     {
-        global $conf;
+		global $user;
 
-        // Clean parameters
-        $this->db->begin();
-        $expression_id = $expression_id != 0 ? $expression_id : 'NULL';
+		$this->fk_price_expression = $expression_id;
 
-        $sql = "UPDATE ".MAIN_DB_PREFIX."product";
-        $sql.= " SET fk_price_expression = ".$expression_id;
-        $sql.= " WHERE rowid = ".$this->id;
-
-        dol_syslog(get_class($this)."::setPriceExpression", LOG_DEBUG);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error()." sql=".$sql;
-            $this->db->rollback();
-            return -1;
-        }
+		return $this->update($this->id, $user);
     }
 
 	/**

From ac8bee28ef2b96165946d315e0a472b7d08b4bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Fri, 6 Nov 2015 11:40:22 +0100
Subject: [PATCH 179/216] NEW #3898 Remove deprecated Product::hidden property

Close #3898
---
 htdocs/product/canvas/product/tpl/card_create.tpl.php | 3 ---
 htdocs/product/canvas/service/tpl/card_create.tpl.php | 3 ---
 htdocs/product/card.php                               | 2 --
 3 files changed, 8 deletions(-)

diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php
index 81ddb147fe3..c5f968dee4f 100644
--- a/htdocs/product/canvas/product/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php
@@ -90,9 +90,6 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
 <?php echo $object->volume_units; ?>
 </td></tr>
 
-<tr><td><?php echo $langs->trans("Hidden"); ?></td>
-<td><?php echo $object->hidden; ?></td></tr>
-
 <tr><td valign="top"><?php echo $langs->trans("NoteNotVisibleOnBill"); ?></td><td>
 <?php echo $object->textarea_note; ?>
 </td></tr>
diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php
index 9d526383a67..39c91695f8f 100644
--- a/htdocs/product/canvas/service/tpl/card_create.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php
@@ -63,9 +63,6 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
 <?php echo $object->duration_unit; ?>
 </td></tr>
 
-<tr><td><?php echo $langs->trans("Hidden"); ?></td>
-<td><?php echo $object->hidden; ?></td></tr>
-
 <tr><td valign="top"><?php echo $langs->trans("NoteNotVisibleOnBill"); ?></td><td>
 <?php echo $object->textarea_note; ?>
 </td></tr>
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 9fadd0f3e5a..3388c7e4c15 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -249,7 +249,6 @@ if (empty($reshook))
             $object->volume             	 = GETPOST('volume');
             $object->volume_units       	 = GETPOST('volume_units');
             $object->finished           	 = GETPOST('finished');
-            $object->hidden             	 = GETPOST('hidden')=='yes'?1:0;
 	        $object->fk_unit                 = GETPOST('units');
             $object->accountancy_code_sell = GETPOST('accountancy_code_sell');
             $object->accountancy_code_buy  = GETPOST('accountancy_code_buy');
@@ -335,7 +334,6 @@ if (empty($reshook))
                 $object->volume                 = GETPOST('volume');
                 $object->volume_units           = GETPOST('volume_units');
                 $object->finished               = GETPOST('finished');
-                $object->hidden                 = GETPOST('hidden')=='yes'?1:0;
 
 	            $units = GETPOST('units', 'int');
 

From ef3c7f927ea3226b028733736b8a78ab9d6af684 Mon Sep 17 00:00:00 2001
From: Gauthier <gauthier.verdol@atm-consulting.fr>
Date: Fri, 6 Nov 2015 16:38:26 +0100
Subject: [PATCH 180/216] FIX : wrong coma in llx_opensurvey_sondage.sql
 creation script

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

diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 16e8a624e72..b728702db79 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -29,5 +29,5 @@ CREATE TABLE llx_opensurvey_sondage (
 	allow_comments tinyint NOT NULL DEFAULT 1,
 	allow_spy tinyint NOT NULL DEFAULT 1,
 	tms TIMESTAMP,
-	sujet TEXT,									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
+	sujet TEXT									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
 ) ENGINE=InnoDB;

From d0e6db7f89c36e051f9c05c4f2c632b8d36b20f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 18:57:35 +0100
Subject: [PATCH 181/216] Use the new banner for first tab of products.

---
 htdocs/core/class/html.form.class.php  |   6 +-
 htdocs/core/lib/functions.lib.php      |  61 +++++++++++---
 htdocs/product/card.php                | 111 +++++++++++--------------
 htdocs/product/class/product.class.php |   8 +-
 4 files changed, 106 insertions(+), 80 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 10f5fc25695..bb7e399f28a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5157,7 +5157,7 @@ class Form
      *    To add a particular filter on select, you must set $object->next_prev_filter to SQL criteria.
      *
      *    @param	object	$object			Object to show
-     *    @param	string	$paramid   		Name of parameter to use to name the id into the URL link
+     *    @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link
      *    @param	string	$morehtml  		More html content to output just before the nav bar
      *    @param	int		$shownav	  	Show Condition (navigation is shown if value is 1)
      *    @param	string	$fieldid   		Nom du champ en base a utiliser pour select next et previous (we make the select max and min on this field)
@@ -5192,7 +5192,7 @@ class Form
         
         $ret.='<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref))?' refidpadding':'').'">';
 
-        // For thirdparty and contact, the ref is he id, so we show something else
+        // For thirdparty and contact, the ref is the id, so we show something else
         if ($object->element == 'societe')
         {
         	$ret.=dol_htmlentities($object->name);
@@ -5360,7 +5360,7 @@ class Form
             else
 			{
 				$nophoto='/public/theme/common/nophoto.png';
-				if (in_array($modulepart,array('userphoto','contact')))	// For module thar are "physical" users
+				if (in_array($modulepart,array('userphoto','contact')))	// For module that are "physical" users
 				{
 					$nophoto='/public/theme/common/user_anonymous.png';
 					if ($object->gender == 'man') $nophoto='/public/theme/common/user_man.png';
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index be0523958bd..db59c8d966d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -854,7 +854,7 @@ function dol_get_fiche_end($notab=0)
  *  Show tab footer of a card
  *
  *  @param	object	$object			Object to show
- *  @param	string	$paramid   		Name of parameter to use to name the id into the URL link
+ *  @param	string	$paramid   		Name of parameter to use to name the id into the URL next/previous link
  *  @param	string	$morehtml  		More html content to output just before the nav bar
  *  @param	int		$shownav	  	Show Condition (navigation is shown if value is 1)
  *  @param	string	$fieldid   		Nom du champ en base a utiliser pour select next et previous (we make the select max and min on this field)
@@ -870,28 +870,67 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 {
 	global $conf, $form, $user, $langs;
 
-	//$showlogo=$object->logo;
-	$showlogo=1;
+	$maxvisiblephotos=1;
+	$showimage=1;
 	$showbarcode=empty($conf->barcode->enabled)?0:($object->barcode?1:0);
 	if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-	$modulepart='societe';
+	$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';
 
 	print '<div class="arearef heightref valignmiddle" width="100%">';
-	if ($showlogo)    $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showphoto($modulepart,$object,0,0,0,'photoref').'</div>';
+	if ($object->element == 'product')
+	{
+	    $width=80; $cssclass='photoref';
+        $showimage=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
+	    $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],1,-$maxvisiblephotos,0,0,0,$width,0).'</div>';
+        else 
+        {
+			$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 
+	{
+	    if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showphoto($modulepart,$object,0,0,0,'photoref','',1,0,$maxvisiblephotos).'</div>';
+	}
 	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)) {
 		$morehtmlright.=ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
-	} else {
+	} 
+	elseif ($object->element == 'product')
+	{
+	    //$morehtmlright.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
+        if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+            $morehtmlright.=ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
+        } else {
+            $morehtmlright.=$object->getLibStatut(2,0);
+        }
+        $morehtmlright.=' &nbsp; ';
+        //$morehtmlright.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';
+	    if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+            $morehtmlright.=ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
+        } else {
+            $morehtmlright.=$object->getLibStatut(2,1);
+        }
+	}
+	else {
 		$morehtmlright.=$object->getLibStatut(2);
 	}
-	if (! empty($object->name_alias)) $morehtmlref.='<div class="refidno">'.$object->name_alias.'</div>';
-	$morehtmlref.='<div class="refidno">';
-	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
-	$morehtmlref.='</div>';
-	if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member')))
+	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') 
+	{
+    	$morehtmlref.='<div class="refidno">';
+    	$morehtmlref.=$object->getBannerAddress('refaddress',$object);
+    	$morehtmlref.='</div>';
+	}
+	if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product')))
 	{
 		$morehtmlref.='<div style="clear: both;"></div><div class="refidno">';
 		$morehtmlref.=$langs->trans("TechnicalID").': '.$object->id;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 9fadd0f3e5a..dcc303a2e0b 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1239,16 +1239,9 @@ else
             	print $object->showOptionals($extrafields,'edit');
             }
 
-            // Note
-            print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
-
-            $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
-            $doleditor->Create();
-
-            print "</td></tr>";
-
-			if($conf->categorie->enabled) {
-				// Categories
+			// Tags-Categories
+            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);
 				$c = new Categorie($db);
@@ -1260,6 +1253,14 @@ else
 				print "</td></tr>";
 			}
 
+            // Note
+            print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';
+
+            $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80);
+            $doleditor->Create();
+
+            print "</td></tr>";
+
             print '</table>';
 
             print '<br>';
@@ -1298,58 +1299,29 @@ else
         // Fiche en mode visu
         else
 		{
-            $head=product_prepare_head($object);
+            $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, 'card', $titre, 0, $picto);
 
-            $showphoto=$object->is_photo_available($conf->product->multidir_output[$object->entity]);
-            $showbarcode=empty($conf->barcode->enabled)?0:1;
-            if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
-
-            // En mode visu
-            print '<table class="border" width="100%"><tr>';
-
-            // Ref
-            print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">';
-            print $form->showrefnav($object,'ref','',1,'ref');
-            print '</td>';
-
-            print '</tr>';
-
-            // Label
-            print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->label.'</td>';
-
-            $nblignes=7;
-            if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++;
-            if ($showbarcode) $nblignes+=2;
-            if ($object->type!= Product::TYPE_SERVICE) $nblignes++;
-            if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2;
-            if ($object->isservice()) $nblignes++;
-            else $nblignes+=4;
-
-            // Photo
-            if ($showphoto || $showbarcode)
-            {
-                print '<td valign="middle" align="center" width="25%" rowspan="'.$nblignes.'">';
-				print '<div class="photolist">';
-				$maxvisiblephotos=(isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO)?$conf->global->PRODUCT_MAX_VISIBLE_PHOTO:5);
-				if ($conf->browser->phone) $maxvisiblephotos=1;
-                if ($showphoto)   print $object->show_photos($conf->product->multidir_output[$object->entity],1,$maxvisiblephotos,0,0,0,80);
-                if ($showphoto && $showbarcode) print '<br><br>';
-                if ($showbarcode) print $form->showbarcode($object);
-				print '</div>';
-                print '</td>';
-            }
-
-            print '</tr>';
-
+            dol_banner_tab($object, 'ref', '', ($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))
             {
             	// TODO change for compatibility with edit in place
             	$typeformat='select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-                print '<tr><td>'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
+                print '<tr><td class="titlefield">'.$form->editfieldkey("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat).'</td><td colspan="2">';
                 print $form->editfieldval("Type",'fk_product_type',$object->type,$object,$user->rights->produit->creer||$user->rights->service->creer,$typeformat);
                 print '</td></tr>';
             }
@@ -1412,6 +1384,7 @@ else
             print '</td></tr>';
 
             // Status (to sell)
+            /*
             print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="2">';
             if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
                 print ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
@@ -1428,7 +1401,8 @@ else
                 print $object->getLibStatut(2,1);
             }
             print '</td></tr>';
-
+            */
+            
             // Batch number management (to batch)
             if (! empty($conf->productbatch->enabled)) {
                 print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';
@@ -1448,10 +1422,17 @@ else
 			print dol_print_url($object->url);
             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%">';
+            
             // Nature
             if($object->type!= Product::TYPE_SERVICE)
             {
-                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
+                print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';
                 print $object->getLibFinished();
                 print '</td></tr>';
             }
@@ -1459,7 +1440,7 @@ else
             if ($object->isservice())
             {
                 // Duration
-                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
+                print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
                 if ($object->duration_value > 1)
                 {
                     $dur=array("h"=>$langs->trans("Hours"),"d"=>$langs->trans("Days"),"w"=>$langs->trans("Weeks"),"m"=>$langs->trans("Months"),"y"=>$langs->trans("Years"));
@@ -1475,7 +1456,7 @@ else
             else
             {
                 // Weight
-                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="2">';
+                print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';
                 if ($object->weight != '')
                 {
                     print $object->weight." ".measuring_units_string($object->weight_units,"weight");
@@ -1549,11 +1530,6 @@ else
             	print $object->showOptionals($extrafields);
             }
 
-            // Note
-            print '<!-- show Note --> '."\n";
-            print '<tr><td class="tdtop">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,1,true)).'</td></tr>'."\n";
-            print '<!-- End show Note --> '."\n";
-
 			// Categories
 			if($conf->categorie->enabled) {
 				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
@@ -1561,8 +1537,17 @@ else
 				print "</td></tr>";
 			}
 
-            print "</table>\n";
+            // Note
+            print '<!-- show Note --> '."\n";
+            print '<tr><td class="tdtop">'.$langs->trans("Note").'</td><td colspan="'.(2+(($showphoto||$showbarcode)?1:0)).'">'.(dol_textishtml($object->note)?$object->note:dol_nl2br($object->note,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();
         }
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 4c1fbc6c929..aea4a3c1433 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3485,9 +3485,10 @@ class Product extends CommonObject
 	 * 	@param		int		$showaction		1=Show icon with action links (resize, delete)
 	 * 	@param		int		$maxHeight		Max height of image when size=1
 	 * 	@param		int		$maxWidth		Max width of image when size=1
+	 *  @param      int     $nolink         Do not add a href link to view enlarged imaged into a new tab
 	 *  @return     string					Html code to show photo. Number of photos shown is saved in this->nbphoto
 	 */
-	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160)
+	function show_photos($sdir,$size=0,$nbmax=0,$nbbyrow=5,$showfilename=0,$showaction=0,$maxHeight=120,$maxWidth=160,$nolink=0)
 	{
 		global $conf,$user,$langs;
 
@@ -3552,7 +3553,7 @@ class Product extends CommonObject
     						else if ($nbbyrow < 0) $return .= '<div class="inline-block">';
 
     						$return.= "\n";
-    						$return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+    						if (empty($nolink)) $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
@@ -3568,7 +3569,8 @@ class Product extends CommonObject
     							$return.= '<img class="photo photowithmargin" border="0" '.($conf->dol_use_jmobile?'max-height':'height').'="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=product&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">';
     						}
 
-    						$return.= '</a>'."\n";
+    						if (empty($nolink)) $return.= '</a>';
+    						$return.="\n";
 
     						if ($showfilename) $return.= '<br>'.$viewfilename;
     						if ($showaction)

From e7554d377fdb6c2d4dc16f784ff3e9717b68bef0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Nov 2015 19:07:05 +0100
Subject: [PATCH 182/216] Fix better error message

---
 htdocs/admin/dict.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 6fe2e8efb38..7022c5877eb 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -510,7 +510,7 @@ if ($id == 10)
 }
 
 
-// Actions ajout ou modification d'une entree dans un dictionnaire de donnee
+// Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd') || GETPOST('actionmodify'))
 {
     $listfield=explode(',',$tabfield[$id]);
@@ -581,7 +581,12 @@ 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 (isset($_POST["localtax1"]) && empty($_POST["localtax1"])) $_POST["localtax1"]='0';	// If empty, we force to 0
     if (isset($_POST["localtax2"]) && empty($_POST["localtax2"])) $_POST["localtax2"]='0';	// If empty, we force to 0

From becce332dd84c91e2105d08235cd115ca9e28392 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 7 Nov 2015 09:49:25 +0100
Subject: [PATCH 183/216] allow chaining and remove header exit

---
 htdocs/fourn/class/fournisseur.commande.class.php | 8 ++++++++
 htdocs/fourn/commande/card.php                    | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6a83aab0155..6246b47dcd3 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -946,16 +946,24 @@ class CommandeFournisseur extends CommonOrder
             dol_syslog(get_class($this)."::commande", LOG_DEBUG);
             if ($this->db->query($sql))
             {
+                $this->statut = 3;
+                $this->methode_commande_id = $methode;
+                $this->date_commande = $this->db->idate($date);
                 $result = 1;
                 $this->log($user, 3, $date, $comment);
             }
             else
             {
+                $this->error = $this->db->lasterror();
+                $this->errors[] = $this->db->lasterror();
                 $result = -1;
             }
         }
         else
         {
+            $result = -1;
+            $this->error = 'Not Authorized';
+            $this->errors[] = 'Not Authorized';
             dol_syslog(get_class($this)."::commande User not Authorized", LOG_ERR);
         }
         return $result ;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index cb1754fa8d3..8078665c321 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -704,15 +704,14 @@ if (empty($reshook))
 
 	if ($action == 'confirm_commande' && $confirm	== 'yes' &&	$user->rights->fournisseur->commande->commander)
 	{
-	    $result	= $object->commande($user, $_REQUEST["datecommande"],	$_REQUEST["methode"], $_REQUEST['comment']);
+	    $result = $object->commande($user, $_REQUEST["datecommande"],	$_REQUEST["methode"], $_REQUEST['comment']);
 	    if ($result > 0)
 	    {
 	        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 		        $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	        }
-	        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-	        exit;
-	    }
+            $action = '';
+        }
 	    else
 	    {
             setEventMessages($object->error, $object->errors, 'errors');

From a597d6c3793c525483b0a57a752a4e7e196e7fa6 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 7 Nov 2015 10:23:56 +0100
Subject: [PATCH 184/216] allow chaining

---
 htdocs/fourn/class/fournisseur.commande.class.php |  3 +++
 htdocs/fourn/commande/card.php                    | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 6246b47dcd3..d64ebe263d1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1837,6 +1837,7 @@ class CommandeFournisseur extends CommonOrder
                 if ($resql)
                 {
                     $result = 0;
+                    $this->statut = $statut;
                     $result=$this->log($user, $statut, $date, $comment);
 
                     $this->db->commit();
@@ -1851,6 +1852,8 @@ class CommandeFournisseur extends CommonOrder
         }
         else
         {
+            $this->error = 'Not Authorized';
+            $this->errors[] = 'Not Authorized';
             dol_syslog(get_class($this)."::Livraison Not Authorized");
             $result = -3;
         }
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 8078665c321..904cd5b3133 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -766,15 +766,15 @@ if (empty($reshook))
 	    {
 	        $date_liv = dol_mktime(GETPOST('rehour'),GETPOST('remin'),GETPOST('resec'),GETPOST("remonth"),GETPOST("reday"),GETPOST("reyear"));
 
-	        $result	= $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment"));
+	        $result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment"));
 	        if ($result > 0)
 	        {
-	            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
-	            exit;
-	        }
+                setEventMessages($langs->trans("DeliveryStateSaved"), null);
+                $action = '';
+            }
 	        else if($result == -3)
 	        {
-	        	setEventMessage($langs->trans("NotAuthorized"), 'errors');
+                setEventMessages($object->error, $object->errors, 'errors');
 	        }
 	        else
 	        {

From 7349862b6464e95af3c783cd89684a212960bf2f Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Sat, 7 Nov 2015 11:13:58 +0100
Subject: [PATCH 185/216] translations

---
 htdocs/fourn/class/fournisseur.commande.class.php | 14 ++++++++------
 htdocs/langs/en_US/main.lang                      |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index d64ebe263d1..e988893dbb4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -481,7 +481,7 @@ class CommandeFournisseur extends CommonOrder
         }
         else
         {
-            $this->error='Not Authorized';
+            $this->error='NotAuthorized';
             dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
             return -1;
         }
@@ -936,6 +936,7 @@ class CommandeFournisseur extends CommonOrder
      */
     function commande($user, $date, $methode, $comment='')
     {
+        global $langs;
         dol_syslog(get_class($this)."::commande");
         $result = 0;
         if ($user->rights->fournisseur->commande->commander)
@@ -962,8 +963,8 @@ class CommandeFournisseur extends CommonOrder
         else
         {
             $result = -1;
-            $this->error = 'Not Authorized';
-            $this->errors[] = 'Not Authorized';
+            $this->error = $langs->trans('NotAuthorized');
+            $this->errors[] = $lanfs->trans('NotAuthorized');
             dol_syslog(get_class($this)."::commande User not Authorized", LOG_ERR);
         }
         return $result ;
@@ -1770,7 +1771,7 @@ class CommandeFournisseur extends CommonOrder
      */
     function Livraison($user, $date, $type, $comment)
     {
-    	global $conf;
+    	global $conf, $langs;
 
         $result = 0;
 		$error = 0;
@@ -1852,8 +1853,8 @@ class CommandeFournisseur extends CommonOrder
         }
         else
         {
-            $this->error = 'Not Authorized';
-            $this->errors[] = 'Not Authorized';
+            $this->error = $langs->trans('NotAuthorized');
+            $this->errors[] = $langs->trans('NotAuthorized');
             dol_syslog(get_class($this)."::Livraison Not Authorized");
             $result = -3;
         }
@@ -2003,6 +2004,7 @@ class CommandeFournisseur extends CommonOrder
 
         if (! $error)
         {
+            $this->statut = $status;
             $this->db->commit();
             return 1;
         }
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 796c14af15e..a05b2b7c06e 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -59,6 +59,7 @@ ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr
 ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
 ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
 ErrorFailedToSaveFile=Error, failed to save file.
+NotAuthorized=You are not authorized to do that.
 SetDate=Set date
 SelectDate=Select a date
 SeeAlso=See also %s

From 09fb87e47da412f13871c7b1f1da1ea2b999ae91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 11:40:31 +0100
Subject: [PATCH 186/216] Prepare tables for categories/tags on projects.
 Looking for a dev to implement categories/tags on projects !

---
 .../install/mysql/migration/3.8.0-3.9.0.sql   | 22 +++++++++++++++-
 .../install/mysql/tables/llx_budget_lines.sql | 18 ++++++-------
 .../tables/llx_categorie_project.key.sql      | 24 ++++++++++++++++++
 .../mysql/tables/llx_categorie_project.sql    | 25 +++++++++++++++++++
 4 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_project.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_categorie_project.sql

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 1f34377e6ec..0705512893e 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -226,7 +226,7 @@ create table llx_budget_lines
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     integer NOT NULL,
-  fk_project	integer NOT NULL,
+  fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come".
   amount		double(24,8) NOT NULL,
   datec         datetime,
   tms           timestamp,
@@ -287,3 +287,23 @@ CREATE TABLE llx_opensurvey_user_formanswers (
 ) ENGINE=InnoDB;
 
 
+
+
+create table llx_categorie_project
+(
+  fk_categorie  integer NOT NULL,
+  fk_project    integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_categorie_project ADD PRIMARY KEY pk_categorie_project (fk_categorie, fk_project);
+ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project);
+
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project   FOREIGN KEY (fk_project) REFERENCES llx_project (rowid);
+
+
+
+
+
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index c5d3d3a4bf2..11b68f68fc4 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -18,13 +18,13 @@
 
 create table llx_budget_lines
 (
-  rowid			integer AUTO_INCREMENT PRIMARY KEY,
-  fk_budget     integer NOT NULL,
-  fk_project	integer NOT NULL,
-  amount		double(24,8) NOT NULL,
-  datec         datetime,
-  tms           timestamp,
-  fk_user_creat integer,
-  fk_user_modif integer,
-  import_key    integer  
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_budget     	integer NOT NULL,
+  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:x=y' = Can also be a dynamic rule to select projects.
+  amount			double(24,8) NOT NULL,
+  datec        		datetime,
+  tms           	timestamp,
+  fk_user_creat 	integer,
+  fk_user_modif 	integer,
+  import_key    	integer  
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_categorie_project.key.sql b/htdocs/install/mysql/tables/llx_categorie_project.key.sql
new file mode 100644
index 00000000000..12532b6eb09
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_project.key.sql
@@ -0,0 +1,24 @@
+-- ============================================================================
+-- Copyright (C) 2007 Patrick Raguin       <patrick.raguin@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_categorie_project ADD PRIMARY KEY pk_categorie_project (fk_categorie, fk_project);
+ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (fk_categorie);
+ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project);
+
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project   FOREIGN KEY (fk_project) REFERENCES llx_project (rowid);
diff --git a/htdocs/install/mysql/tables/llx_categorie_project.sql b/htdocs/install/mysql/tables/llx_categorie_project.sql
new file mode 100644
index 00000000000..ca536822ac2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_categorie_project.sql
@@ -0,0 +1,25 @@
+-- ============================================================================
+-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.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
+-- 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_categorie_project
+(
+  fk_categorie  integer NOT NULL,
+  fk_project    integer NOT NULL,
+  import_key    varchar(14)
+)ENGINE=innodb;

From 99f52110703a22810f854c60645050c414dbffbe Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 11:48:35 +0100
Subject: [PATCH 187/216] NEW Can use the * as a joker characters into search
 boxes of lists

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index db59c8d966d..013217a9f57 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5193,6 +5193,10 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0)
 {
     global $db,$langs;
 
+    if ($mode == 0)
+    {
+    	$value=preg_replace('/\*/','%',$value);	// Replace * with %
+    }
     if ($mode == 1)
     {
     	$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

From 6611cc70189688ff7e058fc91e34aa99784f93a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 12:19:48 +0100
Subject: [PATCH 188/216] NEW #3767 Allow changing multiple prices of a product
 at once

---
 htdocs/product/class/product.class.php |  11 ++
 htdocs/product/price.php               | 228 ++++++++++++++-----------
 2 files changed, 137 insertions(+), 102 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ba4dc432d36..1ebd94b383f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4073,4 +4073,15 @@ class Product extends CommonObject
 
 		return 1;
 	}
+
+	public function getRights()
+	{
+		global $user;
+
+		if ($this->isproduct()) {
+			return $user->rights->produit;
+		} else {
+			return $user->rights->service;
+		}
+	}
 }
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 69802f51d57..1e03780995f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -113,86 +113,108 @@ if (empty($reshook))
 	    $action='';
 	}
 	    
-	if (($action == 'update_price') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
+	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
     {
-		$newprice = '';
-		$newprice_min = '';
-		$newpricebase = '';
-		$newvat = '';
-		
+		$error = 0;
+		$pricestoupdate = array();
+
+		$psq = GETPOST('psqflag');
+		$psq = empty($newpsq) ? 0 : $newpsq;
 		$maxpricesupplier = $object->min_recommended_price();
-		$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
-		// MultiPrix
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-
-			//Shall we generate prices using price rules?
-			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
-			$object->update($object->id, $user);
-
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
-				if (isset($_POST ["price_".$i])) {
-					$level = $i;
-					$newprice = price2num($_POST ["price_".$i], 'MU');
-					$newprice_min = price2num($_POST ["price_min_".$i], 'MU');
-					$newpricebase = $_POST ["multiprices_base_type_".$i];
-					$newnpr = (preg_match('/\*/', $_POST ["tva_tx_".$i]) ? 1 : 0);
-					$newvat = str_replace('*', '', $_POST ["tva_tx_".$i]);
-					$newpsq = GETPOST('psqflag');
-					$newpsq = empty($newpsq) ? 0 : $newpsq;
-					break; // We found submited price
-				}
-			}
-		} else {
-			$level = 0;
-			$newprice = price2num($_POST ["price"], 'MU');
-			$newprice_min = price2num($_POST ["price_min"], 'MU');
-			$newpricebase = $_POST ["price_base_type"];
-			$newnpr = (preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0);
-			$newvat = str_replace('*', '', $_POST ["tva_tx"]);
-			$newpsq = GETPOST('psqflag');
-			$newpsq = empty($newpsq) ? 0 : $newpsq;
-		}
-
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
-			setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors');
-			$error ++;
-			$action = 'edit_price';
-		}
-
-		if ($newprice < $newprice_min && !empty($object->fk_price_expression)) {
-			$newprice = $newprice_min; //Set price same as min, the user will not see the
-		}
-
-		$res = $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);
-
-		if ($res) {
+		if (!empty($conf->dynamicprices->enabled)) {
+			$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
 			if ($object->fk_price_expression != 0) {
 				//Check the expression validity by parsing it
 				$priceparser = new PriceParser($db);
-				$price_result = $priceparser->parseProduct($object);
-				if ($price_result < 0) { //Expression is not valid
+
+				if ($priceparser->parseProduct($object) < 0) {
 					$error ++;
-					$action = 'edit_price';
 					setEventMessage($priceparser->translatedError(), 'errors');
 				}
 			}
-			if (empty($error) && !empty($conf->dynamicprices->enabled)) {
-				$ret = $object->setPriceExpression($object->fk_price_expression);
-				if ($ret < 0) {
-					$error ++;
-					$action = 'edit_price';
-					setEventMessage($object->error, 'errors');
+		}
+
+		// Multiprices
+		if (!$error && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+
+			$newprice = GETPOST('price', 'array');
+			$newprice_min = GETPOST('price_min', 'array');
+			$newpricebase = GETPOST('multiprices_base_type', 'array');
+			$newvattx = GETPOST('tva_tx', 'array');
+
+			//Shall we generate prices using price rules?
+			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
+
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
+
+				if (!isset($newprice[$i])) {
+					continue;
 				}
-			}
-			if (empty($error)) {
-				$action = '';
-				setEventMessage($langs->trans("RecordSaved"));
+
+				$newnpr = (preg_match('/\*/', $newvattx[$i] ? 1 : 0));
+				$newvat = str_replace('*', '', $newvattx[$i]);
+
+				$pricestoupdate[$i] = array(
+					'price' => $newprice[$i],
+					'price_min' => $newprice_min[$i],
+					'price_base_type' => $newpricebase[$i],
+					'vat_tx' => $newvat,
+					'npr' => $newnpr
+				);
 			}
 		} else {
-			$action = 'edit_price';
+			$pricestoupdate[0] = array(
+				'price' => $_POST ["price"],
+				'price_min' => $_POST ["price_min"],
+				'price_base_type' => $_POST ["price_base_type"],
+				'vat_tx' => str_replace('*', '', $_POST ["tva_tx"]),
+				'npr' => preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0
+			);
+		}
+
+		if (!$error && $object->update($object->id, $user) < 1) {
+			$error++;
 			setEventMessage($object->error, 'errors');
+			$action = 'edit_price';
+		}
+
+		if (!$error) {
+			foreach ($pricestoupdate as $key => $val) {
+
+				$newprice = $val['price'];
+
+				if ($val['price'] < $val['price_min'] && !empty($object->fk_price_expression)) {
+					$newprice = $val['price_min']; //Set price same as min, the user will not see the
+				}
+
+				$newprice = price2num($newprice, 'MU');
+				$newprice_min = price2num($val['price_min'], 'MU');
+
+				if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
+					setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors');
+					$error ++;
+					break;
+				}
+
+				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq);
+
+				if ($res < 0) {
+					$error ++;
+					setEventMessage($object->error, 'errors');
+					break;
+				}
+			}
+		}
+
+		if (empty($error)) {
+			$action = '';
+			setEventMessage($langs->trans("RecordSaved"));
+			$db->commit();
+		} else {
+			$action = 'edit_price';
+			$db->rollback();
 		}
 	}
 
@@ -444,13 +466,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		// Selling price
 		print '<tr>' . $langs->trans("SellingPrice") . '</td>';
 		print '<td colspan="2">';
-		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
-			print price($object->multiprices_ttc["$soc->price_level"]);
+		if ($object->multiprices_base_type[$soc->price_level] == 'TTC') {
+			print price($object->multiprices_ttc[$soc->price_level]);
 		} else {
-			print price($object->multiprices["$soc->price_level"]);
+			print price($object->multiprices[$soc->price_level]);
 		}
-		if ($object->multiprices_base_type["$soc->price_level"]) {
-			print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
+		if ($object->multiprices_base_type[$soc->price_level]) {
+			print ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]);
 		} else {
 			print ' ' . $langs->trans($object->price_base_type);
 		}
@@ -458,18 +480,18 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 
 		// Price min
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td colspan="2">';
-		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
+		if ($object->multiprices_base_type[$soc->price_level] == 'TTC')
 		{
-			print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
+			print price($object->multiprices_min_ttc[$soc->price_level]) . ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]);
 		} else {
-			print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]);
+			print price($object->multiprices_min[$soc->price_level]) . ' ' . $langs->trans(empty($object->multiprices_base_type[$soc->price_level])?'HT':$object->multiprices_base_type[$soc->price_level]);
 		}
 		print '</td></tr>';
         
 		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
     	   // TVA
-	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
+	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx[$soc->price_level], true) . '</td></tr>';
 		}
 		else
 		{
@@ -503,28 +525,28 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			print '</td>';
 
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<td style="text-align: right">' . price($object->multiprices_ttc["$i"]);
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<td style="text-align: right">' . price($object->multiprices_ttc[$i]);
 			} else {
-				print '<td style="text-align: right">' . price($object->multiprices["$i"]);
+				print '<td style="text-align: right">' . price($object->multiprices[$i]);
 			}
 
-			if ($object->multiprices_base_type["$i"]) {
-				print ' '.$langs->trans($object->multiprices_base_type ["$i"]).'</td>';;
+			if ($object->multiprices_base_type[$i]) {
+				print ' '.$langs->trans($object->multiprices_base_type [$i]).'</td>';
 			} else {
-				print ' '.$langs->trans($object->price_base_type).'</td>';;
+				print ' '.$langs->trans($object->price_base_type).'</td>';
 			}
 
 			// Prix min
 			print '<td style="text-align: right">';
-			if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT";
-			if ($object->multiprices_base_type["$i"] == 'TTC')
+			if (empty($object->multiprices_base_type[$i])) $object->multiprices_base_type[$i]="HT";
+			if ($object->multiprices_base_type[$i] == 'TTC')
 			{
-				print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
+				print price($object->multiprices_min_ttc[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]);
 			}
 			else
 			{
-				print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
+				print price($object->multiprices_min[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
 
@@ -914,11 +936,12 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		</script>
 		<?php
 
+		print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
-		    
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
-		    if ($i > 1) print '<br>';
+
+			if ($i > 1) print '<br>';
 			elseif (! 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>';
 			}
@@ -927,7 +950,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
 			{
-				print '<input type="hidden" name="tva_tx_' . $i . '" value="' . $object->tva_tx . '">';
+				print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
 			}
 			
 			print '<table class="border" width="100%">';
@@ -936,7 +959,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))	// This option is kept for backward compatibility but has no sense
 			{
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id);
+				print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id);
 				print '</td></tr>';
 			}
 			
@@ -945,22 +968,22 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			$text = $langs->trans('SellingPrice') . ' ' . $i;
 			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 			print '</td><td>';
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<input name="price_' . $i . '" size="10" value="' . price($object->multiprices_ttc ["$i"]) . '">';
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices_ttc [$i]) . '">';
 			} else {
-				print '<input name="price_' . $i . '" size="10" value="' . price($object->multiprices ["$i"]) . '">';
+				print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices [$i]) . '">';
 			}
-			print $form->selectPriceBaseType($object->multiprices_base_type ["$i"], "multiprices_base_type_" . $i);
+			print $form->selectPriceBaseType($object->multiprices_base_type [$i], "multiprices_base_type[" . $i."]");
 			print '</td></tr>';
 
 			// Min price
 			print '<tr><td>';
 			$text = $langs->trans('MinPrice') . ' ' . $i;
 			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min_ttc ["$i"]) . '">';
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min_ttc [$i]) . '">';
 			} else {
-				print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min ["$i"]) . '">';
+				print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min [$i]) . '">';
 			}
 			if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 			{
@@ -968,15 +991,16 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			}
 			print '</td></tr>';
 
-			print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-			print '&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></td></tr>';
-			
 			print '</table>';
 
-			print '</form>';
 		}
-	
+
+		print '<br><div style="text-align: center">';
+		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+		print '&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';
+		print '</form>';
+
 		dol_fiche_end();
 	}
 }

From 45b4122a95bd91d7b197fc8dec6880db77ee72f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 12:19:48 +0100
Subject: [PATCH 189/216] NEW #3767 Allow changing multiple prices of a product
 at once

---
 htdocs/product/class/product.class.php |  11 ++
 htdocs/product/price.php               | 235 ++++++++++++++-----------
 2 files changed, 144 insertions(+), 102 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ba4dc432d36..1ebd94b383f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4073,4 +4073,15 @@ class Product extends CommonObject
 
 		return 1;
 	}
+
+	public function getRights()
+	{
+		global $user;
+
+		if ($this->isproduct()) {
+			return $user->rights->produit;
+		} else {
+			return $user->rights->service;
+		}
+	}
 }
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 69802f51d57..056455a3fff 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -113,86 +113,115 @@ if (empty($reshook))
 	    $action='';
 	}
 	    
-	if (($action == 'update_price') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
+	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
     {
-		$newprice = '';
-		$newprice_min = '';
-		$newpricebase = '';
-		$newvat = '';
-		
+		$error = 0;
+		$pricestoupdate = array();
+
+		$psq = GETPOST('psqflag');
+		$psq = empty($newpsq) ? 0 : $newpsq;
 		$maxpricesupplier = $object->min_recommended_price();
-		$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
-		// MultiPrix
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-
-			//Shall we generate prices using price rules?
-			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
-			$object->update($object->id, $user);
-
-			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
-				if (isset($_POST ["price_".$i])) {
-					$level = $i;
-					$newprice = price2num($_POST ["price_".$i], 'MU');
-					$newprice_min = price2num($_POST ["price_min_".$i], 'MU');
-					$newpricebase = $_POST ["multiprices_base_type_".$i];
-					$newnpr = (preg_match('/\*/', $_POST ["tva_tx_".$i]) ? 1 : 0);
-					$newvat = str_replace('*', '', $_POST ["tva_tx_".$i]);
-					$newpsq = GETPOST('psqflag');
-					$newpsq = empty($newpsq) ? 0 : $newpsq;
-					break; // We found submited price
-				}
-			}
-		} else {
-			$level = 0;
-			$newprice = price2num($_POST ["price"], 'MU');
-			$newprice_min = price2num($_POST ["price_min"], 'MU');
-			$newpricebase = $_POST ["price_base_type"];
-			$newnpr = (preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0);
-			$newvat = str_replace('*', '', $_POST ["tva_tx"]);
-			$newpsq = GETPOST('psqflag');
-			$newpsq = empty($newpsq) ? 0 : $newpsq;
-		}
-
-		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
-			setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors');
-			$error ++;
-			$action = 'edit_price';
-		}
-
-		if ($newprice < $newprice_min && !empty($object->fk_price_expression)) {
-			$newprice = $newprice_min; //Set price same as min, the user will not see the
-		}
-
-		$res = $object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq);
-
-		if ($res) {
+		if (!empty($conf->dynamicprices->enabled)) {
+			$object->fk_price_expression = empty($eid) ? 0 : $eid; //0 discards expression
 
 			if ($object->fk_price_expression != 0) {
 				//Check the expression validity by parsing it
 				$priceparser = new PriceParser($db);
-				$price_result = $priceparser->parseProduct($object);
-				if ($price_result < 0) { //Expression is not valid
+
+				if ($priceparser->parseProduct($object) < 0) {
 					$error ++;
-					$action = 'edit_price';
 					setEventMessage($priceparser->translatedError(), 'errors');
 				}
 			}
-			if (empty($error) && !empty($conf->dynamicprices->enabled)) {
-				$ret = $object->setPriceExpression($object->fk_price_expression);
-				if ($ret < 0) {
-					$error ++;
-					$action = 'edit_price';
-					setEventMessage($object->error, 'errors');
+		}
+
+		// Multiprices
+		if (!$error && !empty($conf->global->PRODUIT_MULTIPRICES)) {
+
+			$newprice = GETPOST('price', 'array');
+			$newprice_min = GETPOST('price_min', 'array');
+			$newpricebase = GETPOST('multiprices_base_type', 'array');
+			$newvattx = GETPOST('tva_tx', 'array');
+
+			//Shall we generate prices using price rules?
+			$object->price_autogen = GETPOST('usePriceRules') == 'on' ? true : false;
+
+			for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++) {
+
+				if (!isset($newprice[$i])) {
+					continue;
+				}
+
+				$newnpr = (preg_match('/\*/', $newvattx[$i] ? 1 : 0));
+				$newvat = str_replace('*', '', $newvattx[$i]);
+
+				$pricestoupdate[$i] = array(
+					'price' => $newprice[$i],
+					'price_min' => $newprice_min[$i],
+					'price_base_type' => $newpricebase[$i],
+					'vat_tx' => $newvat,
+					'npr' => $newnpr
+				);
+
+				//If autogeneration is enabled, then we only set the first level
+				if ($object->price_autogen) {
+					break;
 				}
 			}
-			if (empty($error)) {
-				$action = '';
-				setEventMessage($langs->trans("RecordSaved"));
+		} else {
+			$pricestoupdate[0] = array(
+				'price' => $_POST ["price"],
+				'price_min' => $_POST ["price_min"],
+				'price_base_type' => $_POST ["price_base_type"],
+				'vat_tx' => str_replace('*', '', $_POST ["tva_tx"]),
+				'npr' => preg_match('/\*/', $_POST ["tva_tx"]) ? 1 : 0
+			);
+		}
+
+		if (!$error && $object->update($object->id, $user) < 1) {
+			$error++;
+			setEventMessage($object->error, 'errors');
+			$action = 'edit_price';
+		}
+
+		if (!$error) {
+			$db->begin();
+
+			foreach ($pricestoupdate as $key => $val) {
+
+				$newprice = $val['price'];
+
+				if ($val['price'] < $val['price_min'] && !empty($object->fk_price_expression)) {
+					$newprice = $val['price_min']; //Set price same as min, the user will not see the
+				}
+
+				$newprice = price2num($newprice, 'MU');
+				$newprice_min = price2num($val['price_min'], 'MU');
+
+				if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $newprice_min < $maxpricesupplier) {
+					setEventMessage($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, - 1, - 1, 'auto')), 'errors');
+					$error ++;
+					break;
+				}
+
+				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq);
+
+				if ($res < 0) {
+					$error ++;
+					setEventMessage($object->error, 'errors');
+					break;
+				}
 			}
+		}
+
+		if (empty($error)) {
+			$action = '';
+			setEventMessage($langs->trans("RecordSaved"));
+			$db->commit();
 		} else {
 			$action = 'edit_price';
-			setEventMessage($object->error, 'errors');
+			$db->rollback();
 		}
 	}
 
@@ -444,13 +473,13 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		// Selling price
 		print '<tr>' . $langs->trans("SellingPrice") . '</td>';
 		print '<td colspan="2">';
-		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
-			print price($object->multiprices_ttc["$soc->price_level"]);
+		if ($object->multiprices_base_type[$soc->price_level] == 'TTC') {
+			print price($object->multiprices_ttc[$soc->price_level]);
 		} else {
-			print price($object->multiprices["$soc->price_level"]);
+			print price($object->multiprices[$soc->price_level]);
 		}
-		if ($object->multiprices_base_type["$soc->price_level"]) {
-			print ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
+		if ($object->multiprices_base_type[$soc->price_level]) {
+			print ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]);
 		} else {
 			print ' ' . $langs->trans($object->price_base_type);
 		}
@@ -458,18 +487,18 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 
 		// Price min
 		print '<tr><td>' . $langs->trans("MinPrice") . '</td><td colspan="2">';
-		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
+		if ($object->multiprices_base_type[$soc->price_level] == 'TTC')
 		{
-			print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
+			print price($object->multiprices_min_ttc[$soc->price_level]) . ' ' . $langs->trans($object->multiprices_base_type[$soc->price_level]);
 		} else {
-			print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]);
+			print price($object->multiprices_min[$soc->price_level]) . ' ' . $langs->trans(empty($object->multiprices_base_type[$soc->price_level])?'HT':$object->multiprices_base_type[$soc->price_level]);
 		}
 		print '</td></tr>';
         
 		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
     	   // TVA
-	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
+	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx[$soc->price_level], true) . '</td></tr>';
 		}
 		else
 		{
@@ -503,28 +532,28 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 			if (! empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			print '</td>';
 
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<td style="text-align: right">' . price($object->multiprices_ttc["$i"]);
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<td style="text-align: right">' . price($object->multiprices_ttc[$i]);
 			} else {
-				print '<td style="text-align: right">' . price($object->multiprices["$i"]);
+				print '<td style="text-align: right">' . price($object->multiprices[$i]);
 			}
 
-			if ($object->multiprices_base_type["$i"]) {
-				print ' '.$langs->trans($object->multiprices_base_type ["$i"]).'</td>';;
+			if ($object->multiprices_base_type[$i]) {
+				print ' '.$langs->trans($object->multiprices_base_type [$i]).'</td>';
 			} else {
-				print ' '.$langs->trans($object->price_base_type).'</td>';;
+				print ' '.$langs->trans($object->price_base_type).'</td>';
 			}
 
 			// Prix min
 			print '<td style="text-align: right">';
-			if (empty($object->multiprices_base_type["$i"])) $object->multiprices_base_type["$i"]="HT";
-			if ($object->multiprices_base_type["$i"] == 'TTC')
+			if (empty($object->multiprices_base_type[$i])) $object->multiprices_base_type[$i]="HT";
+			if ($object->multiprices_base_type[$i] == 'TTC')
 			{
-				print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
+				print price($object->multiprices_min_ttc[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]);
 			}
 			else
 			{
-				print price($object->multiprices_min["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
+				print price($object->multiprices_min[$i]) . ' ' . $langs->trans($object->multiprices_base_type[$i]);
 			}
 			print '</td></tr>';
 
@@ -894,7 +923,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		<script>
 
 			var showHidePriceRules = function () {
-				var otherPrices = $('div.fiche form:not(:first)');
+				var otherPrices = $('div.fiche form table:not(:first), div.fiche form table:first tr:not(:first)');
 				var minPrice1 = $('div.fiche form:first tr:eq(1)');
 
 				if (jQuery('input#usePriceRules').prop('checked')) {
@@ -914,11 +943,12 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 		</script>
 		<?php
 
+		print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
+
 		for($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i ++)
 		{
-		    
-			print '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">';
-		    if ($i > 1) print '<br>';
+
+			if ($i > 1) print '<br>';
 			elseif (! 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>';
 			}
@@ -927,7 +957,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			print '<input type="hidden" name="id" value="' . $object->id . '">';
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))
 			{
-				print '<input type="hidden" name="tva_tx_' . $i . '" value="' . $object->tva_tx . '">';
+				print '<input type="hidden" name="tva_tx[' . $i . ']" value="' . $object->tva_tx . '">';
 			}
 			
 			print '<table class="border" width="100%">';
@@ -936,7 +966,7 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))	// This option is kept for backward compatibility but has no sense
 			{
 				print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';
-				print $form->load_tva("tva_tx_" . $i, $object->multiprices_tva_tx["$i"], $mysoc, '', $object->id);
+				print $form->load_tva("tva_tx[" . $i.']', $object->multiprices_tva_tx[$i], $mysoc, '', $object->id);
 				print '</td></tr>';
 			}
 			
@@ -945,22 +975,22 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			$text = $langs->trans('SellingPrice') . ' ' . $i;
 			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
 			print '</td><td>';
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<input name="price_' . $i . '" size="10" value="' . price($object->multiprices_ttc ["$i"]) . '">';
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices_ttc [$i]) . '">';
 			} else {
-				print '<input name="price_' . $i . '" size="10" value="' . price($object->multiprices ["$i"]) . '">';
+				print '<input name="price[' . $i . ']" size="10" value="' . price($object->multiprices [$i]) . '">';
 			}
-			print $form->selectPriceBaseType($object->multiprices_base_type ["$i"], "multiprices_base_type_" . $i);
+			print '&nbsp;'.$form->selectPriceBaseType($object->multiprices_base_type [$i], "multiprices_base_type[" . $i."]");
 			print '</td></tr>';
 
 			// Min price
 			print '<tr><td>';
 			$text = $langs->trans('MinPrice') . ' ' . $i;
 			print $form->textwithpicto($text, $langs->trans("PrecisionUnitIsLimitedToXDecimals", $conf->global->MAIN_MAX_DECIMALS_UNIT), 1, 1);
-			if ($object->multiprices_base_type ["$i"] == 'TTC') {
-				print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min_ttc ["$i"]) . '">';
+			if ($object->multiprices_base_type [$i] == 'TTC') {
+				print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min_ttc [$i]) . '">';
 			} else {
-				print '<td><input name="price_min_' . $i . '" size="10" value="' . price($object->multiprices_min ["$i"]) . '">';
+				print '<td><input name="price_min[' . $i . ']" size="10" value="' . price($object->multiprices_min [$i]) . '">';
 			}
 			if ( !empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 			{
@@ -968,15 +998,16 @@ if ($action == 'edit_price' && ($user->rights->produit->creer || $user->rights->
 			}
 			print '</td></tr>';
 
-			print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="' . $langs->trans("Save") . '">';
-			print '&nbsp;&nbsp;&nbsp;';
-			print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></td></tr>';
-			
 			print '</table>';
 
-			print '</form>';
 		}
-	
+
+		print '<br><div style="text-align: center">';
+		print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
+		print '&nbsp;&nbsp;&nbsp;';
+		print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '"></div>';
+		print '</form>';
+
 		dol_fiche_end();
 	}
 }

From 350ef610e99d931cbe1d2b3a27a4fbf36efa2b1a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 12:36:34 +0100
Subject: [PATCH 190/216] Fix beluga pdf for projects. Add missing expense
 reports.

---
 .../project/doc/pdf_beluga.modules.php        | 57 +++++++++++++------
 htdocs/langs/en_US/projects.lang              |  1 +
 htdocs/projet/admin/project.php               |  2 +-
 htdocs/projet/card.php                        | 14 +++--
 htdocs/projet/class/project.class.php         |  5 +-
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 4a8839ef865..11b1d378981 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -94,8 +94,8 @@ class pdf_beluga extends ModelePDFProjects
 		$this->posxref=$this->marge_gauche+1;
 		$this->posxdate=$this->marge_gauche+25;
 		$this->posxsociety=$this->marge_gauche+45;
-		$this->posxamountht=$this->marge_gauche+115;
-		$this->posxamountttc=$this->marge_gauche+140;
+		$this->posxamountht=$this->marge_gauche+110;
+		$this->posxamountttc=$this->marge_gauche+135;
 		$this->posxstatut=$this->marge_gauche+165;
 	}
 
@@ -231,14 +231,16 @@ class pdf_beluga extends ModelePDFProjects
                     	'class'=>'Propal',
                     	'table'=>'propal',
                         'datefieldname'=>'datep',
-                    	'test'=>$conf->propal->enabled && $user->rights->propale->lire),
+                    	'test'=>$conf->propal->enabled && $user->rights->propale->lire,
+                        'lang'=>'propal'),
                     'order'=>array(
                     	'name'=>"CustomersOrders",
                     	'title'=>"ListOrdersAssociatedProject",
                     	'class'=>'Commande',
                     	'table'=>'commande',
                     	'datefieldname'=>'date_commande',
-                    	'test'=>$conf->commande->enabled && $user->rights->commande->lire),
+                    	'test'=>$conf->commande->enabled && $user->rights->commande->lire,
+                        'lang'=>'order'),
                     'invoice'=>array(
                     	'name'=>"CustomersInvoices",
                     	'title'=>"ListInvoicesAssociatedProject",
@@ -246,21 +248,24 @@ class pdf_beluga extends ModelePDFProjects
                     	'margin'=>'add',
                     	'table'=>'facture',
                     	'datefieldname'=>'datef',
-                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire,
+                        'lang'=>'bills'),
                     'invoice_predefined'=>array(
                     	'name'=>"PredefinedInvoices",
                     	'title'=>"ListPredefinedInvoicesAssociatedProject",
                     	'class'=>'FactureRec',
                     	'table'=>'facture_rec',
                     	'datefieldname'=>'datec',
-                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire),
+                    	'test'=>$conf->facture->enabled && $user->rights->facture->lire,
+                        'lang'=>'bills'),
                     'order_supplier'=>array(
                     	'name'=>"SuppliersOrders",
                     	'title'=>"ListSupplierOrdersAssociatedProject",
                     	'class'=>'CommandeFournisseur',
                     	'table'=>'commande_fournisseur',
                     	'datefieldname'=>'date_commande',
-                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire),
+                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire,
+                        'lang'=>'orders'),
                     'invoice_supplier'=>array(
                     	'name'=>"BillsSuppliers",
                     	'title'=>"ListSupplierInvoicesAssociatedProject",
@@ -268,14 +273,16 @@ class pdf_beluga extends ModelePDFProjects
                     	'margin'=>'minus',
                     	'table'=>'facture_fourn',
                     	'datefieldname'=>'datef',
-                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire),
+                    	'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire,
+                        'lang'=>'bills'),
                     'contract'=>array(
                     	'name'=>"Contracts",
                     	'title'=>"ListContractAssociatedProject",
                     	'class'=>'Contrat',
                     	'table'=>'contrat',
                     	'datefieldname'=>'date_contrat',
-                    	'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
+                    	'test'=>$conf->contrat->enabled && $user->rights->contrat->lire,
+                        'lang'=>'contract'),
                     'intervention'=>array(
                     	'name'=>"Interventions",
                     	'title'=>"ListFichinterAssociatedProject",
@@ -283,7 +290,8 @@ class pdf_beluga extends ModelePDFProjects
                     	'table'=>'fichinter',
                     	'datefieldname'=>'date_valid',
                     	'disableamount'=>1,
-                    	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
+                    	'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire,
+                        'lang'=>'interventions'),
                     'trip'=>array(
                     	'name'=>"TripsAndExpenses",
                     	'title'=>"ListTripAssociatedProject",
@@ -292,7 +300,18 @@ class pdf_beluga extends ModelePDFProjects
                     	'datefieldname'=>'dated',
                     	'margin'=>'minus',
                     	'disableamount'=>1,
-                    	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
+                    	'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire,
+                        'lang'=>'trip'),
+                    'expensereport'=>array(
+                    	'name'=>"ExpensesReports",
+                    	'title'=>"ListTripAssociatedProject",
+                    	'class'=>'ExpenseReport',
+                    	'table'=>'expensereport',
+                    	'datefieldname'=>'dated',
+                    	'margin'=>'minus',
+                    	'disableamount'=>1,
+                    	'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire,
+                        'lang'=>'trip'),                    
                     'agenda'=>array(
                     	'name'=>"Agenda",
                     	'title'=>"ListActionsAssociatedProject",
@@ -300,7 +319,8 @@ class pdf_beluga extends ModelePDFProjects
                     	'table'=>'actioncomm',
                     	'datefieldname'=>'datep',
                     	'disableamount'=>1,
-                    	'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire)
+                    	'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->read,
+                        'lang'=>'agenda')
                 );
                 
                 
@@ -311,12 +331,17 @@ class pdf_beluga extends ModelePDFProjects
                 	$tablename=$value['table'];
                 	$datefieldname=$value['datefieldname'];
                 	$qualified=$value['test'];
+                	$langstoload=$value['lang'];
+                	$langs->load($langstoload);
                 	
                     if ($qualified)
                     {
+                        //var_dump("$key, $tablename, $datefieldname, $dates, $datee");
                         $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee);
+                        //var_dump($elementarray);
+                        
                         $num = count($elementarray);
-                        if ($num > 0)
+                        if ($num >= 0)
                         {
                             $nexY = $pdf->GetY() + 5;
                             $curY = $nexY;
@@ -334,9 +359,9 @@ class pdf_beluga extends ModelePDFProjects
                             $pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $outputlangs->transnoentities("ThirdParty"), 1, 'L');
                             if (empty($value['disableamount'])) {
                                 $pdf->SetXY($this->posxamountht, $curY);
-                                $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHT"), 1, 'R');
+                                $pdf->MultiCell($this->posxamountttc - $this->posxamountht, 3, $outputlangs->transnoentities("AmountHTShort"), 1, 'R');
                                 $pdf->SetXY($this->posxamountttc, $curY);
-                                $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTC"), 1, 'R');
+                                $pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, $outputlangs->transnoentities("AmountTTCShort"), 1, 'R');
                             } else {
                                 $pdf->SetXY($this->posxamountht, $curY);
                                 $pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, "", 1, 'R');
@@ -434,8 +459,6 @@ class pdf_beluga extends ModelePDFProjects
                     }
                 }
 
-
-
 				/*
 				 * Pied de page
 				 */
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 4ed6ccfc2f5..505f6bce8e5 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -176,6 +176,7 @@ ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
 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.
 OpenedProjectsByThirdparties=Opened projects by thirdparties
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 686e764978a..f42fc7c4720 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -104,7 +104,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']);
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 748f91dbefe..c05cb6948a5 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -450,10 +450,13 @@ if ($action == 'create' && $user->rights->projet->creer)
     if (is_numeric($defaultref) && $defaultref <= 0) $defaultref='';
 
     // Ref
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.($_POST["ref"]?$_POST["ref"]:$defaultref).'"></td></tr>';
+    $suggestedref=($_POST["ref"]?$_POST["ref"]:$defaultref);
+    print '<tr><td><span class="fieldrequired">'.$langs->trans("Ref").'</span></td><td><input size="12" type="text" name="ref" value="'.$suggestedref.'">';
+    print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
+    print '</td></tr>';
 
     // Label
-    print '<tr><td><span class="fieldrequired">'.$langs->trans("Label").'</span></td><td><input size="40" 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").'"></td></tr>';
 
     // Thirdparty
     print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
@@ -617,12 +620,15 @@ else
         print '<table class="border" width="100%">';
 
         // Ref
+        $suggestedref=$object->ref;
         print '<tr><td class="fieldrequired" width="30%">'.$langs->trans("Ref").'</td>';
-        print '<td><input size="12" name="ref" value="'.$object->ref.'"></td></tr>';
+        print '<td><input size="12" name="ref" value="'.$suggestedref.'">';
+        print ' '.$form->textwithpicto('', $langs->trans("YouCanCompleteRef", $suggestedref));
+        print '</td></tr>';
 
         // Label
         print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-        print '<td><input size="40" name="title" value="'.$object->title.'"></td></tr>';
+        print '<td><input size="80" name="title" value="'.$object->title.'"></td></tr>';
 
         // Thirdparty
         print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7ac7fa66cea..aca5fe67d0d 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -453,7 +453,9 @@ class Project extends CommonObject
     function get_element_list($type, $tablename, $datefieldname='', $dates='', $datee='')
     {
         $elements = array();
-
+        
+        if ($this->id <= 0) return $elements;
+        
 		if ($type == 'agenda')
         {
             $sql = "SELECT id as rowid FROM " . MAIN_DB_PREFIX . "actioncomm WHERE fk_project=" . $this->id;
@@ -929,6 +931,7 @@ class Project extends CommonObject
         $this->date_c = $now;
         $this->date_m = $now;
         $this->date_start = $now;
+        $this->date_end = $now + (3600 * 24 * 365);
         $this->note_public = 'SPECIMEN';
 		$this->fk_ele = 20000;
         $this->opp_amount = 20000;

From 439e4a483df61da1801eb857d5e27124ba4b1b0e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 12:37:05 +0100
Subject: [PATCH 191/216] Doc comment

---
 htdocs/install/mysql/tables/llx_budget.sql       | 2 +-
 htdocs/install/mysql/tables/llx_budget_lines.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
index aeb60cd1ce5..908bfc1337c 100644
--- a/htdocs/install/mysql/tables/llx_budget.sql
+++ b/htdocs/install/mysql/tables/llx_budget.sql
@@ -20,7 +20,7 @@ create table llx_budget
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   entity		integer NOT NULL DEFAULT 1,
-  label         varchar(255) NOT NULL,
+  label         varchar(255) NOT NULL,					-- For example 'Global budget for year' or 'Budget for each project'
   status        integer,
   note			text,	
   date_start	date,
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 11b68f68fc4..aba5c7f53ee 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -20,7 +20,7 @@ create table llx_budget_lines
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     	integer NOT NULL,
-  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:x=y' = Can also be a dynamic rule to select projects.
+  fk_project_ids	varchar(255) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come". 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
   tms           	timestamp,

From c0872d690e7dc56b4c6b077bf766c38395df3b1b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 13:32:14 +0100
Subject: [PATCH 192/216] Use new banner for other tabs of product

---
 htdocs/margin/tabs/productMargins.php         |  35 +--
 htdocs/margin/tabs/thirdpartyMargins.php      |  32 +--
 htdocs/product/document.php                   |  30 +--
 htdocs/product/fournisseurs.php               |  31 +--
 htdocs/product/price.php                      |  41 +---
 htdocs/product/stock/product.php              | 213 ++++++++----------
 .../product/stock/tpl/stockcorrection.tpl.php |   4 +-
 .../product/stock/tpl/stocktransfer.tpl.php   |   6 +-
 htdocs/product/traduction.php                 | 128 +++++------
 9 files changed, 231 insertions(+), 289 deletions(-)

diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 934be1f5a41..3b952b099ef 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -82,28 +82,13 @@ if ($id > 0 || ! empty($ref))
 		$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 		dol_fiche_head($head, 'margin', $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,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$object->label.'</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-		print $object->getLibStatut(2,0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-		print $object->getLibStatut(2,1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		// Total Margin
 		print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
@@ -125,7 +110,11 @@ if ($id > 0 || ! empty($ref))
 		}
 
 		print "</table>";
-		print '</div>';
+		
+        print '</div>';
+        print '<div style="clear:both"></div>';
+		
+		dol_fiche_end();
 
 
         if ($user->rights->facture->lire) {
diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php
index bd2730edda0..9f2f745ad0c 100644
--- a/htdocs/margin/tabs/thirdpartyMargins.php
+++ b/htdocs/margin/tabs/thirdpartyMargins.php
@@ -73,21 +73,21 @@ if ($socid > 0)
 
     dol_fiche_head($head, 'margin', $langs->trans("ThirdParty"),0,'company');
 
-    print '<table class="border" width="100%">';
-
-    print '<tr><td width="20%">'.$langs->trans('ThirdPartyName').'</td>';
-    print '<td colspan="3">';
-    print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom');
-    print '</td></tr>';
-
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+    dol_banner_tab($object, 'socid', '', ($user->societe_id?0:1), 'rowid', 'nom');
+    
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border tableforfield" width="100%">';
+    
+    // Alias names (commercial, trademark or alias names)
+    print '<tr><td class="titlefield">'.$langs->trans('AliasNames').'</td><td>';
+    print $object->name_alias;
+    print "</td></tr>";
 
     if ($object->client)
     {
-        print '<tr><td>';
+        print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
         if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
@@ -96,7 +96,7 @@ if ($socid > 0)
 
     if ($object->fournisseur)
     {
-        print '<tr><td>';
+        print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
         if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
@@ -104,7 +104,7 @@ if ($socid > 0)
     }
 
     // Total Margin
-    print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+    print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
     print '<span id="totalMargin"></span>'; // set by jquery (see below)
     print '</td></tr>';
 
@@ -123,7 +123,11 @@ if ($socid > 0)
     }
 
     print "</table>";
+    
+    dol_fiche_end();
+    
     print '</div>';
+    print '<div style="clear:both"></div>';
 
 
     $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index baf736b47e5..93a5c21862d 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -195,33 +195,21 @@ if ($object->id)
 	}
 	
 
-    print '<table class="border" width="100%">';
-
-    // Ref
-    print '<tr>';
-    print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-	print $form->showrefnav($object,'ref','',1,'ref');
-    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>';
+    dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+    
+    print '<div class="fichecenter">';
+    
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border tableforfield" width="100%">';
 
     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>';
+    print '<div style="clear:both"></div>';
+    
+    dol_fiche_end();
 
     $modulepart = 'produit';
     $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 526b67b123c..dfbd5679ac4 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -264,21 +264,15 @@ if ($id > 0 || $ref)
 			$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
 			dol_fiche_head($head, 'suppliers', $titre, 0, $picto);
 
-
-			print '<table class="border" width="100%">';
-
-			// Reference
-			print '<tr>';
-			print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
-			print $form->showrefnav($object,'ref','',1,'ref');
-			print '</td>';
-			print '</tr>';
-
-			// Label
-			print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$object->label.'</td></tr>';
+            dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+            
+            print '<div class="fichecenter">';
+            
+            print '<div class="underbanner clearboth"></div>';
+            print '<table class="border tableforfield" width="100%">';
 
 			// Minimum Price
-			print '<tr><td>'.$langs->trans("BuyingPriceMin").'</td>';
+			print '<tr><td class="titlefield">'.$langs->trans("BuyingPriceMin").'</td>';
             print '<td colspan="2">';
 			$product_fourn = new ProductFournisseur($db);
 			if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
@@ -288,14 +282,13 @@ if ($id > 0 || $ref)
 			}
             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>';
 
-			print "</div>\n";
+            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))
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 69802f51d57..e1e1eeab0fe 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -402,34 +402,13 @@ $titre = $langs->trans("CardProduct" . $object->type);
 $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
 dol_fiche_head($head, 'price', $titre, 0, $picto);
 
-print '<table class="border" width="100%">';
+dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
 
-// Ref
-print '<tr>';
-print '<td width="20%">' . $langs->trans("Ref") . '</td><td colspan="2">';
-print $form->showrefnav($object, 'ref', '', 1, 'ref');
-print '</td>';
-print '</tr>';
 
-// Label
-print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="2">' . $object->label . '</td>';
+print '<div class="fichecenter">';
 
-$isphoto = $object->is_photo_available($conf->product->multidir_output [$object->entity]);
-
-$nblignes = 5;
-if ($isphoto) {
-	// Photo
-	print '<td valign="middle" align="center" width="30%" rowspan="' . $nblignes . '">';
-	print $object->show_photos($conf->product->multidir_output [$object->entity], 1, 1, 0, 0, 0, 80);
-	print '</td>';
-}
-
-print '</tr>';
-
-// Status (to sell)
-print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="2">';
-print $object->getLibStatut(2, 0);
-print '</td></tr>';
+print '<div class="underbanner clearboth"></div>';
+print '<table class="border tableforfield" width="100%">';
 
 // MultiPrix
 if (! empty($conf->global->PRODUIT_MULTIPRICES))
@@ -442,7 +421,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		$soc->fetch($socid);
 
 		// Selling price
-		print '<tr>' . $langs->trans("SellingPrice") . '</td>';
+		print '<tr><td class="titlefield">' . $langs->trans("SellingPrice") . '</td>';
 		print '<td colspan="2">';
 		if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
 			print price($object->multiprices_ttc["$soc->price_level"]);
@@ -483,12 +462,12 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 		if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
 		{
     	   // We show only vat for level 1
-	       print '<tr><td>' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
+	       print '<tr><td class="titlefield">' . $langs->trans("VATRate") . '</td><td colspan="2">' . vatrate($object->multiprices_tva_tx [1], true) . '</td></tr>';
 		}
 		else
 		{
             // TVA
-	        print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
+	        print '<tr><td class="titlefield">' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
 		}
 	   
 		print '<tr class="liste_titre"><td style="text-align: center">'.$langs->trans("PriceLevel").'</td><td style="text-align: center">'.$langs->trans("SellingPrice").'</td><td style="text-align: center">'.$langs->trans("MinPrice").'</td></tr>';
@@ -605,7 +584,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES))
 else 
 {
 	// TVA
-	print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
+	print '<tr><td class="titlefield">' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true) . '</td></tr>';
 
 	// Price
 	print '<tr><td>' . $langs->trans("SellingPrice") . '</td><td>';
@@ -703,6 +682,10 @@ else
 
 print "</table>\n";
 
+print '</div>';
+print '<div style="clear:both"></div>';
+   
+
 dol_fiche_end();
 
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index dfa0cf0c55c..c37424e548b 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -72,24 +72,24 @@ if ($cancel) $action='';
 // Set stock limit
 if ($action == 'setstocklimit')
 {
-    $product = new Product($db);
-    $result=$product->fetch($id);
-    $product->seuil_stock_alerte=$stocklimit;
-    $result=$product->update($product->id,$user,0,'update');
+    $object = new Product($db);
+    $result=$object->fetch($id);
+    $object->seuil_stock_alerte=$stocklimit;
+    $result=$object->update($object->id,$user,0,'update');
     if ($result < 0)
-    	setEventMessage($product->error, 'errors');
+    	setEventMessage($object->error, 'errors');
     $action='';
 }
 
 // Set desired stock
 if ($action == 'setdesiredstock')
 {
-    $product = new Product($db);
-    $result=$product->fetch($id);
-    $product->desiredstock=$desiredstock;
-    $result=$product->update($product->id,$user,0,'update');
+    $object = new Product($db);
+    $result=$object->fetch($id);
+    $object->desiredstock=$desiredstock;
+    $result=$object->update($object->id,$user,0,'update');
     if ($result < 0)
-    	setEventMessage($product->error, 'errors');
+    	setEventMessage($object->error, 'errors');
     $action='';
 }
 
@@ -112,10 +112,10 @@ if ($action == "correct_stock" && ! $cancel)
 
 	if (! empty($conf->productbatch->enabled))
 	{
-		$product = new Product($db);
-		$result=$product->fetch($id);
+		$object = new Product($db);
+		$result=$object->fetch($id);
 
-		if ($product->hasbatch() && (! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) {
+		if ($object->hasbatch() && (! GETPOST("sellby")) && (! GETPOST("eatby")) && (! GETPOST("batch_number"))) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
 			$error++;
 			$action='correction';
@@ -127,13 +127,13 @@ if ($action == "correct_stock" && ! $cancel)
 		$priceunit=price2num(GETPOST("unitprice"));
 		if (is_numeric(GETPOST("nbpiece")) && $id)
 		{
-			if (empty($product)) {
-				$product = new Product($db);
-				$result=$product->fetch($id);
+			if (empty($object)) {
+				$object = new Product($db);
+				$result=$object->fetch($id);
 			}
-			if ($product->hasbatch())
+			if ($object->hasbatch())
 			{
-				$result=$product->correct_stock_batch(
+				$result=$object->correct_stock_batch(
 					$user,
 					GETPOST("id_entrepot"),
 					GETPOST("nbpiece"),
@@ -148,7 +148,7 @@ if ($action == "correct_stock" && ! $cancel)
 			}
 			else
 			{
-				$result=$product->correct_stock(
+				$result=$object->correct_stock(
 		    		$user,
 		    		GETPOST("id_entrepot"),
 		    		GETPOST("nbpiece"),
@@ -168,13 +168,13 @@ if ($action == "correct_stock" && ! $cancel)
 				}
 				else
 				{
-	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$product->id);
+	            	header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 					exit;
 				}
 			}
 			else
 			{
-			    setEventMessage($product->error,'errors');
+			    setEventMessage($object->error,'errors');
 			    $action='correction';
 			}
 		}
@@ -207,20 +207,20 @@ if ($action == "transfert_stock" && ! $cancel)
 	{
 		if ($id)
 		{
-			$product = new Product($db);
-			$result=$product->fetch($id);
+			$object = new Product($db);
+			$result=$object->fetch($id);
 
 			$db->begin();
 
-			$product->load_stock();	// Load array product->stock_warehouse
+			$object->load_stock();	// Load array product->stock_warehouse
 
 			// Define value of products moved
 			$pricesrc=0;
-			//if (isset($product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$product->stock_warehouse[GETPOST("id_entrepot_source")]->pmp;
-			if (isset($product->pmp)) $pricesrc=$product->pmp;
+			//if (isset($object->stock_warehouse[GETPOST("id_entrepot_source")]->pmp)) $pricesrc=$object->stock_warehouse[GETPOST("id_entrepot_source")]->pmp;
+			if (isset($object->pmp)) $pricesrc=$object->pmp;
 			$pricedest=$pricesrc;
 
-			if ($product->hasbatch())
+			if ($object->hasbatch())
 			{
 				$pdluo = new Productbatch($db);
 
@@ -251,7 +251,7 @@ if ($action == "transfert_stock" && ! $cancel)
 				if (! $error)
 				{
 					// Remove stock
-					$result1=$product->correct_stock_batch(
+					$result1=$object->correct_stock_batch(
 						$user,
 						$srcwarehouseid,
 						GETPOST("nbpiece",'int'),
@@ -262,7 +262,7 @@ if ($action == "transfert_stock" && ! $cancel)
 						GETPOST('inventorycode')
 					);
 					// Add stock
-					$result2=$product->correct_stock_batch(
+					$result2=$object->correct_stock_batch(
 						$user,
 						GETPOST("id_entrepot_destination",'int'),
 						GETPOST("nbpiece",'int'),
@@ -277,7 +277,7 @@ if ($action == "transfert_stock" && ! $cancel)
 			else
 			{
 				// Remove stock
-				$result1=$product->correct_stock(
+				$result1=$object->correct_stock(
 					$user,
 					GETPOST("id_entrepot_source"),
 					GETPOST("nbpiece"),
@@ -288,7 +288,7 @@ if ($action == "transfert_stock" && ! $cancel)
 				);
 
 				// Add stock
-				$result2=$product->correct_stock(
+				$result2=$object->correct_stock(
 					$user,
 					GETPOST("id_entrepot_destination"),
 					GETPOST("nbpiece"),
@@ -309,13 +309,13 @@ if ($action == "transfert_stock" && ! $cancel)
 				}
 				else
 				{
-					header("Location: product.php?id=".$product->id);
+					header("Location: product.php?id=".$object->id);
 					exit;
 				}
 			}
 			else
 			{
-				setEventMessages($product->error, $product->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
 				$action='transfert';
 			}
@@ -370,70 +370,45 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans('Save'))
  * View
  */
 
+$form = new Form($db);
 $formproduct=new FormProduct($db);
 
 
 if ($id > 0 || $ref)
 {
-	$product = new Product($db);
-	$result = $product->fetch($id,$ref);
-	$product->load_stock();
+	$object = new Product($db);
+	$result = $object->fetch($id,$ref);
+	$object->load_stock();
 
 	$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-	llxHeader("",$langs->trans("CardProduct".$product->type),$help_url);
+	llxHeader("",$langs->trans("CardProduct".$object->type),$help_url);
 
 	if ($result > 0)
 	{
-		$head=product_prepare_head($product);
-		$titre=$langs->trans("CardProduct".$product->type);
-		$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
+		$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_htmloutput_events();
 
-		$form = new Form($db);
-
-		print '<table class="border" width="100%">';
-
-		// Ref
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td>';
-		print $form->showrefnav($product,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->label.'</td>';
-		print '</tr>';
-
-        // Status (to sell)
-        print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td>';
-        if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-            print ajax_object_onoff($product, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
-        } else {
-            print $product->getLibStatut(2,0);
-        }
-        print '</td></tr>';
-
-        // Status (to buy)
-        print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="2">';
-        if (! empty($conf->use_javascript_ajax) && $user->rights->produit->creer && ! empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
-            print ajax_object_onoff($product, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
-        } else {
-            print $product->getLibStatut(2,1);
-        }
-        print '</td></tr>';
-
+        dol_banner_tab($object, 'ref', '', ($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) {
 			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
-			print $product->getLibStatut(0,2);
+			print $object->getLibStatut(0,2);
 			print '</td></tr>';
 		}
 
 		// PMP
 		print '<tr><td>'.$langs->trans("AverageUnitPricePMP").'</td>';
 		print '<td>';
-		if ($product->pmp > 0) print price($product->pmp).' '.$langs->trans("HT");
+		if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
 		print '</td>';
 		print '</tr>';
 
@@ -441,14 +416,13 @@ if ($id > 0 || $ref)
 		print '<tr><td>'.$langs->trans("BuyingPriceMin").'</td>';
 		print '<td colspan="2">';
 		$product_fourn = new ProductFournisseur($db);
-		if ($product_fourn->find_min_price_product_fournisseur($product->id) > 0)
+		if ($product_fourn->find_min_price_product_fournisseur($object->id) > 0)
 		{
 			if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur();
 			else print $langs->trans("NotDefined");
 		}
 		print '</td></tr>';
 
-		$object = $product;
 		if (empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 			// Price
@@ -483,17 +457,17 @@ if ($id > 0 || $ref)
 		}
 
         // Stock alert threshold
-        print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer).'</td><td colspan="2">';
-        print $form->editfieldval("StockLimit",'stocklimit',$product->seuil_stock_alerte,$product,$user->rights->produit->creer);
+        print '<tr><td>'.$form->editfieldkey("StockLimit",'stocklimit',$object->seuil_stock_alerte,$object,$user->rights->produit->creer).'</td><td colspan="2">';
+        print $form->editfieldval("StockLimit",'stocklimit',$object->seuil_stock_alerte,$object,$user->rights->produit->creer);
         print '</td></tr>';
 
         // Desired stock
-        print '<tr><td>'.$form->editfieldkey("DesiredStock",'desiredstock',$product->desiredstock,$product,$user->rights->produit->creer).'</td><td colspan="2">';
-        print $form->editfieldval("DesiredStock",'desiredstock',$product->desiredstock,$product,$user->rights->produit->creer);
+        print '<tr><td>'.$form->editfieldkey("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer).'</td><td colspan="2">';
+        print $form->editfieldval("DesiredStock",'desiredstock',$object->desiredstock,$object,$user->rights->produit->creer);
         print '</td></tr>';
 
         // Real stock
-        $product->load_stock();
+        $object->load_stock();
         $text_stock_options = '';
         $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)?$langs->trans("DeStockOnShipment").'<br>':'');
         $text_stock_options.= (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER)?$langs->trans("DeStockOnValidateOrder").'<br>':'');
@@ -504,15 +478,15 @@ if ($id > 0 || $ref)
         print '<tr><td>';
         print $form->textwithtooltip($langs->trans("PhysicalStock"), $text_stock_options, 2, 1, img_picto('', 'info'), '', 2);
         print '</td>';
-		print '<td>'.$product->stock_reel;
-		if ($product->seuil_stock_alerte && ($product->stock_reel < $product->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
+		print '<td>'.$object->stock_reel;
+		if ($object->seuil_stock_alerte && ($object->stock_reel < $object->seuil_stock_alerte)) print ' '.img_warning($langs->trans("StockLowerThanLimit"));
 		print '</td>';
 		print '</tr>';
 
         // Calculating a theorical value
         print '<tr><td>'.$langs->trans("VirtualStock").'</td>';
-        print "<td>".(empty($product->stock_theorique)?0:$product->stock_theorique);
-        if ($product->stock_theorique < $product->seuil_stock_alerte) {
+        print "<td>".(empty($object->stock_theorique)?0:$object->stock_theorique);
+        if ($object->stock_theorique < $object->seuil_stock_alerte) {
             print ' '.img_warning($langs->trans("StockLowerThanLimit"));
         }
         print '</td>';
@@ -528,36 +502,36 @@ if ($id > 0 || $ref)
         if (! empty($conf->commande->enabled))
         {
             if ($found) print '<br>'; else $found=1;
-            print $langs->trans("ProductQtyInCustomersOrdersRunning").': '.$product->stats_commande['qty'];
-            $result=$product->load_stats_commande(0,'0');
-            if ($result < 0) dol_print_error($db,$product->error);
-            print ' ('.$langs->trans("ProductQtyInDraft").': '.$product->stats_commande['qty'].')';
+            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=$product->load_stats_sending(0,'2');
-            print $langs->trans("ProductQtyInShipmentAlreadySent").': '.$product->stats_expedition['qty'];
+            $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=$product->load_stats_commande_fournisseur(0,'3,4');
-            print $langs->trans("ProductQtyInSuppliersOrdersRunning").': '.$product->stats_commande_fournisseur['qty'];
-            $result=$product->load_stats_commande_fournisseur(0,'0,1,2');
-            if ($result < 0) dol_print_error($db,$product->error);
-            print ' ('.$langs->trans("ProductQtyInDraftOrWaitingApproved").': '.$product->stats_commande_fournisseur['qty'].')';
+            $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").': '.$product->stats_reception['qty'];
+            print $langs->trans("ProductQtyInSuppliersShipmentAlreadyRecevied").': '.$object->stats_reception['qty'];
         }
 
         print '</td></tr>';
@@ -565,7 +539,7 @@ if ($id > 0 || $ref)
 		// Last movement
 		$sql = "SELECT max(m.datem) as datem";
 		$sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql.= " WHERE m.fk_product = '".$product->id."'";
+		$sql.= " WHERE m.fk_product = '".$object->id."'";
 		$resqlbis = $db->query($sql);
 		if ($resqlbis)
 		{
@@ -580,18 +554,21 @@ if ($id > 0 || $ref)
 		if ($lastmovementdate)
 		{
 		    print dol_print_date($lastmovementdate,'dayhour').' ';
-		    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("FullList").'</a>)';
+		    print '(<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("FullList").'</a>)';
 		}
 		else
 		{
-		     print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product->id.'">'.$langs->trans("None").'</a>';
+		     print '<a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$object->id.'">'.$langs->trans("None").'</a>';
 		}
 		print "</td></tr>";
 
 		print "</table>";
 
+        print '</div>';
+        print '<div style="clear:both"></div>';
+    		
+		dol_fiche_end();
 	}
-	print '</div>';
 
 	/*
 	 * Correct stock
@@ -618,7 +595,7 @@ if ($id > 0 || $ref)
 	if ($_GET["action"] == "definir")
 	{
 		print load_fiche_titre($langs->trans("SetStock"));
-		print "<form action=\"product.php?id=$product->id\" method=\"post\">\n";
+		print "<form action=\"product.php?id=$object->id\" method=\"post\">\n";
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="create_stock">';
 		print '<table class="border" width="100%"><tr>';
@@ -645,19 +622,19 @@ else
 /* ************************************************************************** */
 
 
-if (empty($action) && $product->id)
+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='.$product->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
+        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=correction">'.$langs->trans("StockCorrection").'</a>';
     }
 
-    //if (($user->rights->stock->mouvement->creer) && ! $product->hasbatch())
+    //if (($user->rights->stock->mouvement->creer) && ! $object->hasbatch())
     if ($user->rights->stock->mouvement->creer)
 	{
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'&amp;action=transfert">'.$langs->trans("StockMovement").'</a>';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert">'.$langs->trans("StockMovement").'</a>';
 	}
 
 	print '</div>';
@@ -678,7 +655,7 @@ print '<td align="right">'.$langs->trans("EstimatedStockValueShort").'</td>';
 print '<td align="right">'.$langs->trans("SellPriceMin").'</td>';
 print '<td align="right">'.$langs->trans("EstimatedStockValueSellShort").'</td>';
 print '</tr>';
-if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
+if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
 {
 	print '<tr class="liste_titre"><td width="10%"></td>';
 	print '<td align="right" width="10%">'.$langs->trans("batch_number").'</td>';
@@ -695,7 +672,7 @@ $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 ps.fk_product = ".$product->id;
+$sql.= " AND ps.fk_product = ".$object->id;
 $sql.= " ORDER BY e.label";
 
 $entrepotstatic=new Entrepot($db);
@@ -718,25 +695,25 @@ if ($resql)
 		print '<td colspan="4">'.$entrepotstatic->getNomUrl(1).'</td>';
 		print '<td align="right">'.$obj->reel.($obj->reel<0?' '.img_warning():'').'</td>';
 		// PMP
-		print '<td align="right">'.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').'</td>';
+		print '<td align="right">'.(price2num($object->pmp)?price2num($object->pmp,'MU'):'').'</td>';
 		// Value purchase
-		print '<td align="right">'.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').'</td>';
+		print '<td align="right">'.(price2num($object->pmp)?price(price2num($object->pmp*$obj->reel,'MT')):'').'</td>';
         // Sell price
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1);
+        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price,'MU'),1);
         else print $langs->trans("Variable");
         print '</td>';
         // Value sell
         print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'</td>';
+        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($object->price*$obj->reel,'MT'),1).'</td>';
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
-		if (price2num($product->pmp)) $totalwithpmp += $obj->reel;
-		$totalvalue = $totalvalue + ($product->pmp*$obj->reel);
-        $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel);
+		if (price2num($object->pmp)) $totalwithpmp += $obj->reel;
+		$totalvalue = $totalvalue + ($object->pmp*$obj->reel);
+        $totalvaluesell = $totalvaluesell + ($object->price*$obj->reel);
 		//Batch Detail
-		if ((! empty($conf->productbatch->enabled)) && $product->hasbatch())
+		if ((! empty($conf->productbatch->enabled)) && $object->hasbatch())
 		{
 			$details=Productbatch::findAll($db,$obj->product_stock_id);
 			if ($details<0) dol_print_error($db);
@@ -762,7 +739,7 @@ if ($resql)
 				{
                     print "\n".'<tr><td align="right">';
                     print img_picto($langs->trans("Tranfer"),'uparrow','class="hideonsmartphone"').' ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$product->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockMovement").'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=transfert&amp;pdluoid='.$pdluo->id.'">'.$langs->trans("StockMovement").'</a>';
 					// Disabled, because edition of stock content must use the "Correct stock menu".
 					// Do not use this, or data will be wrong (bad tracking of movement label, inventory code, ...
                     //print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=editline&amp;lineid='.$pdluo->id.'#'.$pdluo->id.'">';
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index dc102d8eb05..b1121731293 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -21,7 +21,9 @@
 
 <!-- BEGIN PHP TEMPLATE STOCKCORRECTION.TPL.PHP -->
 <?php
-$langs->load("productbatch");
+        if (! is_object($product)) $product=$object;
+
+        $langs->load("productbatch");
 
 		if (empty($id)) $id = $object->id;
 
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index de947a75014..93c3135e5f1 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -21,7 +21,11 @@
 
 <!-- BEGIN PHP TEMPLATE STOCKCORRECTION.TPL.PHP -->
 <?php
-		$pdluoid=GETPOST('pdluoid','int');
+        if (! is_object($product)) $product=$object;
+
+        $langs->load("productbatch");
+        
+        $pdluoid=GETPOST('pdluoid','int');
 
 	    $pdluo = new Productbatch($db);
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 413cb589dff..96187fad8dd 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -58,9 +58,9 @@ if ($cancel == $langs->trans("Cancel"))
 
 if ($action == 'delete' && GETPOST('langtodelete','alpha'))
 {
-	$product = new Product($db);
-	$product->fetch($id);
-	$product->delMultiLangs(GETPOST('langtodelete','alpha'));
+	$object = new Product($db);
+	$object->fetch($id);
+	$object->delMultiLangs(GETPOST('langtodelete','alpha'));
 }
 
 // Add translation
@@ -68,33 +68,33 @@ if ($action == 'vadd' &&
 $cancel != $langs->trans("Cancel") &&
 ($user->rights->produit->creer || $user->rights->service->creer))
 {
-	$product = new Product($db);
-	$product->fetch($id);
+	$object = new Product($db);
+	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
 	// update de l'objet
 	if ( $_POST["forcelangprod"] == $current_lang )
 	{
-		$product->label			= $_POST["libelle"];
-		$product->description	= dol_htmlcleanlastbr($_POST["desc"]);
-		$product->note			= dol_htmlcleanlastbr($_POST["note"]);
+		$object->label			= $_POST["libelle"];
+		$object->description	= dol_htmlcleanlastbr($_POST["desc"]);
+		$object->note			= dol_htmlcleanlastbr($_POST["note"]);
 	}
 	else
 	{
-		$product->multilangs[$_POST["forcelangprod"]]["label"]			= $_POST["libelle"];
-		$product->multilangs[$_POST["forcelangprod"]]["description"]	= dol_htmlcleanlastbr($_POST["desc"]);
-		$product->multilangs[$_POST["forcelangprod"]]["note"]			= dol_htmlcleanlastbr($_POST["note"]);
+		$object->multilangs[$_POST["forcelangprod"]]["label"]			= $_POST["libelle"];
+		$object->multilangs[$_POST["forcelangprod"]]["description"]	= dol_htmlcleanlastbr($_POST["desc"]);
+		$object->multilangs[$_POST["forcelangprod"]]["note"]			= dol_htmlcleanlastbr($_POST["note"]);
 	}
 
 	// sauvegarde en base
-	if ( $product->setMultiLangs() > 0 )
+	if ( $object->setMultiLangs() > 0 )
 	{
 		$action = '';
 	}
 	else
 	{
 		$action = 'add';
-		setEventMessage($product->error,'errors');
+		setEventMessage($object->error,'errors');
 	}
 }
 
@@ -103,34 +103,34 @@ if ($action == 'vedit' &&
 $cancel != $langs->trans("Cancel") &&
 ($user->rights->produit->creer || $user->rights->service->creer))
 {
-	$product = new Product($db);
-	$product->fetch($id);
+	$object = new Product($db);
+	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ( $product->multilangs as $key => $value ) // enregistrement des nouvelles valeurs dans l'objet
+	foreach ( $object->multilangs as $key => $value ) // enregistrement des nouvelles valeurs dans l'objet
 	{
 		if ( $key == $current_lang )
 		{
-			$product->label			= $_POST["libelle-".$key];
-			$product->description	= dol_htmlcleanlastbr($_POST["desc-".$key]);
-			$product->note			= dol_htmlcleanlastbr($_POST["note-".$key]);
+			$object->label			= $_POST["libelle-".$key];
+			$object->description	= dol_htmlcleanlastbr($_POST["desc-".$key]);
+			$object->note			= dol_htmlcleanlastbr($_POST["note-".$key]);
 		}
 		else
 		{
-			$product->multilangs[$key]["label"]			= $_POST["libelle-".$key];
-			$product->multilangs[$key]["description"]	= dol_htmlcleanlastbr($_POST["desc-".$key]);
-			$product->multilangs[$key]["note"]			= dol_htmlcleanlastbr($_POST["note-".$key]);
+			$object->multilangs[$key]["label"]			= $_POST["libelle-".$key];
+			$object->multilangs[$key]["description"]	= dol_htmlcleanlastbr($_POST["desc-".$key]);
+			$object->multilangs[$key]["note"]			= dol_htmlcleanlastbr($_POST["note-".$key]);
 		}
 	}
 
-	if ( $product->setMultiLangs() > 0 )
+	if ( $object->setMultiLangs() > 0 )
 	{
 		$action = '';
 	}
 	else
 	{
 		$action = 'edit';
-		setEventMessage($product->error,'errors');
+		setEventMessage($object->error,'errors');
 	}
 }
 
@@ -139,24 +139,24 @@ if ($action == 'vdelete' &&
 $cancel != $langs->trans("Cancel") &&
 ($user->rights->produit->creer || $user->rights->service->creer))
 {
-	$product = new Product($db);
-	$product->fetch($id);
+	$object = new Product($db);
+	$object->fetch($id);
 	$langtodelete=GETPOST('langdel','alpha');
 
 
-	if ( $product->delMultiLangs($langtodelete) > 0 )
+	if ( $object->delMultiLangs($langtodelete) > 0 )
 	{
 		$action = '';
 	}
 	else
 	{
 		$action = 'edit';
-		setEventMessage($product->error,'errors');
+		setEventMessage($object->error,'errors');
 	}
 }
 
-$product = new Product($db);
-$result = $product->fetch($id,$ref);
+$object = new Product($db);
+$result = $object->fetch($id,$ref);
 
 
 /*
@@ -168,20 +168,10 @@ llxHeader("","",$langs->trans("Translation"));
 $form = new Form($db);
 $formadmin=new FormAdmin($db);
 
-$head=product_prepare_head($product);
-$titre=$langs->trans("CardProduct".$product->type);
-$picto=($product->type==Product::TYPE_SERVICE?'service':'product');
-dol_fiche_head($head, 'translation', $titre, 0, $picto);
+$head=product_prepare_head($object);
+$titre=$langs->trans("CardProduct".$object->type);
+$picto=($object->type==Product::TYPE_SERVICE?'service':'product');
 
-print '<table class="border" width="100%">';
-
-// Reference
-print '<tr>';
-print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
-print $form->showrefnav($product,'ref','',1,'ref');
-print '</td>';
-print '</tr>';
-print '</table>';
 
 if ($action == 'edit')
 {
@@ -191,33 +181,40 @@ if ($action == 'edit')
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="action" value="vedit">';
-	print '<input type="hidden" name="id" value="'.$product->id.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-	if (! empty($product->multilangs))
+    dol_fiche_head($head, 'translation', $titre, 0, $picto);
+    
+    dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+	
+	if (! empty($object->multilangs))
 	{
-		foreach ($product->multilangs as $key => $value)
+		foreach ($object->multilangs as $key => $value)
 		{
-			print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
+			$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 '<table class="border" width="100%">';
-			print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$product->multilangs[$key]["label"].'"></td></tr>';
+			print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$object->multilangs[$key]["label"].'"></td></tr>';
 			print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';
 
-			$doleditor = new DolEditor("desc-$key", $product->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
+			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
 			$doleditor->Create();
 
 			print '</td></tr>';
 			print '<tr><td valign="top" width="15%">'.$langs->trans('Note').'</td><td>';
 
-			$doleditor = new DolEditor("note-$key", $product->multilangs[$key]["note"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
+			$doleditor = new DolEditor("note-$key", $object->multilangs[$key]["note"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 3, 80);
 			$doleditor->Create();
 
 			print '</td></tr>';
-			print '<tr height="30px"><td colspan="2" align="right"><a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=vdelete&id='.$product->id.'&langdel='.$key.'">'.$langs->trans("Delete").'</a></td></tr>';
 			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").'">';
@@ -228,25 +225,30 @@ if ($action == 'edit')
 }
 else
 {
-	$cnt_trans = 0;
-	if (! empty($product->multilangs))
+    dol_fiche_head($head, 'translation', $titre, 0, $picto);
+    
+    dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+    
+    $cnt_trans = 0;
+	if (! empty($object->multilangs))
 	{
-		foreach ($product->multilangs as $key => $value)
+		foreach ($object->multilangs as $key => $value)
 		{
 			$cnt_trans++;
 			$s=picto_from_langcode($key);
-			print "<br>".($s?$s.' ':'')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$product->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('', '')."</a><br>";
 			print '<table class="border" width="100%">';
-			print '<tr><td width="15%">'.$langs->trans('Label').'</td><td>'.$product->multilangs[$key]["label"].'</td></tr>';
-			print '<tr><td width="15%">'.$langs->trans('Description').'</td><td>'.$product->multilangs[$key]["description"].'</td></tr>';
-			print '<tr><td width="15%">'.$langs->trans('Note').'</td><td>'.$product->multilangs[$key]["note"].'</td></tr>';
+			print '<tr><td width="15%">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
+			print '<tr><td width="15%">'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
+			print '<tr><td width="15%">'.$langs->trans('Note').'</td><td>'.$object->multilangs[$key]["note"].'</td></tr>';
 			print '</table>';
 		}
 	}
 	if (! $cnt_trans) print '<br>'. $langs->trans('NoTranslation');
+
+	dol_fiche_end();
 }
 
-print "</div>\n";
 
 
 /* ************************************************************************** */
@@ -260,8 +262,8 @@ print "\n<div class=\"tabsAction\">\n";
 if ($action == '')
 if ($user->rights->produit->creer || $user->rights->service->creer)
 {
-	print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$product->id.'">'.$langs->trans("Add").'</a>';
-	print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$product->id.'">'.$langs->trans("Update").'</a>';
+	print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&id='.$object->id.'">'.$langs->trans("Add").'</a>';
+	print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&id='.$object->id.'">'.$langs->trans("Update").'</a>';
 }
 
 print "\n</div>\n";
@@ -284,7 +286,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 
 	print '<table class="border" width="100%">';
 	print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Language').'</td><td>';
-    print $formadmin->select_language('','forcelangprod',0,$product->multilangs,1);
+    print $formadmin->select_language('','forcelangprod',0,$object->multilangs,1);
 	print '</td></tr>';
 	print '<tr><td valign="top" width="15%" class="fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
 	print '<tr><td valign="top" width="15%">'.$langs->trans('Description').'</td><td>';

From 8ccb8c92e000b8f39811858eb16d7b28287b8d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 14:29:38 +0100
Subject: [PATCH 193/216] FIX #3897 Incorrect colspan in tr#tablelines >
 tr#trlinefordates

Close #3897
---
 htdocs/core/tpl/objectline_create.tpl.php | 36 +++++++++++++++++++----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index edb065c9d9b..ee70101318b 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -5,6 +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>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -315,14 +316,39 @@ else {
 <?php
 if ((! empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
 {
-	if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) $colspan = 10;
-	else $colspan = 9;
-	if($this->situation_cycle_ref) $colspan++;
-	if (! empty($inputalsopricewithtax)) $colspan++;	// We add 1 if col total ttc
-	if (in_array($object->element,array('propal','askpricesupplier','facture','invoice','commande','order','order_supplier','invoice_supplier'))) $colspan++;	// With this, there is a column move button
+	$colspan = 6;
+
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+		$colspan++;
+	}
+	if ($this->situation_cycle_ref) {
+		$colspan++;
+	}
+	// We add 1 if col total ttc
+	if (!empty($inputalsopricewithtax)) {
+		$colspan++;
+	}
 	if ($conf->global->PRODUCT_USE_UNITS) {
 		$colspan++;
 	}
+	if (count($object->lines)) {
+		//There will be an edit and a delete button
+		$colspan += 2;
+
+		// With this, there is a column move button ONLY if lines > 1
+		if (in_array($object->element, array(
+			'propal',
+			'askpricesupplier',
+			'facture',
+			'invoice',
+			'commande',
+			'order',
+			'order_supplier',
+			'invoice_supplier'
+		))) {
+			$colspan++;
+		}
+	}
 
 	if (! empty($usemargins))
 	{

From 0451cc1e734ce3244b505edd0d7a2a6f25d14e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 14:31:12 +0100
Subject: [PATCH 194/216] FIX #3931 [Insight] Logical operators should be
 avoided - in htdocs/core/class/extrafields.class.php, line 261

Close #3931
---
 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 c53d1b793f3..645b50cb8bc 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -258,7 +258,7 @@ class ExtraFields
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
 		{
-			if(is_array($param) and count($param) > 0)
+			if(is_array($param) && count($param) > 0)
 			{
 				$params = $this->db->escape(serialize($param));
 			}

From ba42a7779fb7a27a2de5b6fc9019d31bf6278f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 14:34:26 +0100
Subject: [PATCH 195/216] FIX #3877 HTML encoded strings when searching for a
 supplier invoice

Close #3877
---
 htdocs/fourn/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 4252e4a9ef6..a46c5e6ca38 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -273,7 +273,7 @@ if ($resql)
     if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-        print $langs->trans("FilterOnInto", $search_all, join(', ',$fieldstosearchall));
+        print $langs->transnoentities("FilterOnInto", $search_all, join(', ',$fieldstosearchall));
     }
     
 	print '<table class="liste" width="100%">';

From 75b4cb472785aea6152cbee70837b4d365e0a9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 14:37:47 +0100
Subject: [PATCH 196/216] NEW #3876 Renamed Product::isservice and
 Product::isproduct to match PSR-2

---
 htdocs/core/lib/doc.lib.php            | 2 +-
 htdocs/core/lib/pdf.lib.php            | 2 +-
 htdocs/core/lib/product.lib.php        | 2 +-
 htdocs/product/card.php                | 8 ++++----
 htdocs/product/class/product.class.php | 4 ++--
 htdocs/product/composition/card.php    | 4 ++--
 htdocs/product/fournisseurs.php        | 2 +-
 htdocs/public/paybox/newpayment.php    | 2 +-
 htdocs/public/paypal/newpayment.php    | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 330d3d2ba39..76337ec2763 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -106,7 +106,7 @@ function doc_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
 			$ref_prodserv = "";
 			if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 			{
-				if ($prodser->isservice())
+				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 8e0eef6d53b..881415555bc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -1166,7 +1166,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
 			$ref_prodserv = "";
 			if (! empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
 			{
-				if ($prodser->isservice())
+				if ($prodser->isService())
 				{
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				}
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 69eb63717b2..d0bc74e77c3 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -98,7 +98,7 @@ function product_prepare_head($object)
 	$head[$h][2] = 'referers';
 	$h++;
 
-    if ($object->isproduct() || ($object->isservice() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+    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/product/card.php b/htdocs/product/card.php
index a7291cc1895..4c30691318f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1038,7 +1038,7 @@ else
             require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
             $type = $langs->trans('Product');
-            if ($object->isservice()) $type = $langs->trans('Service');
+            if ($object->isService()) $type = $langs->trans('Service');
             //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");
 
             // Main official, simple, and not duplicated code
@@ -1144,7 +1144,7 @@ else
 
             // Stock
             /*
-            if ($object->isproduct() && ! empty($conf->stock->enabled))
+            if ($object->isProduct() && ! empty($conf->stock->enabled))
             {
                 print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
                 print '<input name="seuil_stock_alerte" size="4" value="'.$object->seuil_stock_alerte.'">';
@@ -1169,7 +1169,7 @@ else
                 print '</td></tr>';
             }
 
-            if ($object->isservice())
+            if ($object->isService())
             {
                 // Duration
                 print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';
@@ -1435,7 +1435,7 @@ else
                 print '</td></tr>';
             }
 
-            if ($object->isservice())
+            if ($object->isService())
             {
                 // Duration
                 print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ba4dc432d36..0311d7cf281 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -3789,7 +3789,7 @@ class Product extends CommonObject
      *
      * @return  boolean     True if it's a product
      */
-	function isproduct()
+	function isProduct()
 	{
 		return ($this->type == Product::TYPE_PRODUCT ? true : false);
 	}
@@ -3799,7 +3799,7 @@ class Product extends CommonObject
      *
      * @return  boolean     True if it's a service
      */
-	function isservice()
+	function isService()
 	{
 		return ($this->type == Product::TYPE_SERVICE ? true : false);
 	}
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index 276356d8bca..86dfb8a8fd4 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -193,8 +193,8 @@ if ($id > 0 || ! empty($ref))
 		print "<tr>";
 
 		$nblignes=6;
-		if ($object->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
-		if ($object->isservice()) $nblignes++;
+		if ($object->isProduct() && ! empty($conf->stock->enabled)) $nblignes++;
+		if ($object->isService()) $nblignes++;
 
 			// Reference
 			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index dfbd5679ac4..96aa9aa6311 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -521,7 +521,7 @@ if ($id > 0 || $ref)
 			{
 				// Suppliers list title
 				print '<table class="noborder" width="100%">';
-				if ($object->isproduct()) $nblignefour=4;
+				if ($object->isProduct()) $nblignefour=4;
 				else $nblignefour=4;
 
 				$param="&id=".$object->id;
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 42ea013eade..481fd17f049 100644
--- a/htdocs/public/paybox/newpayment.php
+++ b/htdocs/public/paybox/newpayment.php
@@ -583,7 +583,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	$duration='';
 	if ($contractline->fk_product)
 	{
-		if ($product->isservice() && $product->duration_value > 0)
+		if ($product->isService() && $product->duration_value > 0)
 		{
 			$label=$langs->trans("Duration");
 
diff --git a/htdocs/public/paypal/newpayment.php b/htdocs/public/paypal/newpayment.php
index 23f81c4295b..dcb43c07170 100644
--- a/htdocs/public/paypal/newpayment.php
+++ b/htdocs/public/paypal/newpayment.php
@@ -720,7 +720,7 @@ if (GETPOST("source") == 'contractline' && $valid)
 	$duration='';
 	if ($contractline->fk_product)
 	{
-		if ($product->isservice() && $product->duration_value > 0)
+		if ($product->isService() && $product->duration_value > 0)
 		{
 			$label=$langs->trans("Duration");
 

From 57e162d7f87a250014c7ec6ae6e4a9094a3b6ee6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 15:13:51 +0100
Subject: [PATCH 197/216] The component selectAjaxArray can return javascript
 part into a global "delayed" variable so caller can output it at end of page.
 This reduce the Flash Over Unstyle Content effect.

---
 htdocs/core/class/html.form.class.php         | 32 ++++++----
 htdocs/main.inc.php                           | 31 +++++----
 htdocs/margin/tabs/productMargins.php         |  2 +-
 htdocs/product/class/product.class.php        | 10 +--
 htdocs/product/document.php                   |  2 +-
 htdocs/product/stats/card.php                 | 63 ++++++++-----------
 htdocs/product/stats/commande.php             | 36 ++++-------
 htdocs/product/stats/commande_fournisseur.php | 43 +++++--------
 htdocs/product/stats/contrat.php              | 38 +++++------
 htdocs/product/stats/facture.php              | 37 ++++-------
 htdocs/product/stats/facture_fournisseur.php  | 36 ++++-------
 htdocs/product/stats/propal.php               | 36 ++++-------
 htdocs/product/stock/product.php              |  7 ++-
 htdocs/public/test/test_forms.php             |  1 -
 14 files changed, 158 insertions(+), 216 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 822c43f3370..6c586ffe9b7 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4513,22 +4513,25 @@ 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
-     * 	@return	string							HTML select string.
+     *  @param  string  $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)
+     * 	@return	string   						HTML select string
      */
-    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='')
+    static function selectArrayAjax($htmlname, $url, $id='', $moreparam='', $moreparamtourl='', $disabled=0, $minimumInputLength=1, $morecss='', $callurlonselect=0, $placeholder='', $acceptdelayedhtml=0)
     {
         global $langs;
+        global $delayedhtmlcontent;      
         
-    	$out = '';
-
     	$tmpplugin='select2';
-    	$out.='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
+        
+    	$out='<input type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'">';
+    	
+    	$outdelayed='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 	    	<script type="text/javascript">
 	    	$(document).ready(function () {
     	      
-    	      '.($callurlonselect ? 'var saveRemoteData = [];':'').'
+    	        '.($callurlonselect ? 'var saveRemoteData = [];':'').'
     	    
-              $(".'.$htmlname.'").select2({
+                $(".'.$htmlname.'").select2({
 			    	ajax: {
 				    	dir: "ltr",
 				    	url: "'.$url.'",
@@ -4584,12 +4587,17 @@ class Form
                     });
     			});' : '' ) . '
     			
-    	});
-	    </script>';
+    	   });
+	       </script>';
 
-
-		$out.='<input type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'">';
-		
+		if ($acceptdelayedhtml)
+		{
+		    $delayedhtmlcontent.=$outdelayed;
+		}
+		else
+		{
+		    $out.=$outdelayed;
+		}
 		return $out;
     }
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8943ca95821..354ecb7b611 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -931,7 +931,7 @@ if (! function_exists("llxHeader"))
 		}
 		if (empty($conf->dol_hide_leftmenu))
 		{
-			left_menu('', $help_url, '', '', 1, $title);
+			left_menu('', $help_url, '', '', 1, $title, 1);
 		}
 
 		// main area
@@ -1401,13 +1401,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 			</script>' . "\n";
 		}
 
-		// Wrapper to show tooltips
-		print '<script type="text/javascript">
-	jQuery(document).ready(function () {
-		jQuery(".classfortooltip").tipTip({maxWidth: "'.dol_size(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
-	});
-</script>' . "\n";
-
 		// Raven.js for client-side Sentry logging support
 		if (array_key_exists('mod_syslog_sentry', $conf->loghandlers) && ! empty($conf->global->SYSLOG_SENTRY_DSN)) 
 		{
@@ -1539,9 +1532,10 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
  *  @param  array	$menu_array_after           Table of menu entries to show after entries of menu handler
  *  @param  int		$leftmenuwithoutmainarea    Must be set to 1. 0 by default for backward compatibility with old modules.
  *  @param  string	$title                      Title of web page
+ *  @param  string  $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)
  *  @return	void
  */
-function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='')
+function left_menu($menu_array_before, $helppagename='', $notused='', $menu_array_after='', $leftmenuwithoutmainarea=0, $title='', $acceptdelayedhtml=0)
 {
     global $user, $conf, $langs, $db, $form;
     global $hookmanager, $menumanager;
@@ -1563,7 +1557,7 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
 	    {
     	    if (! is_object($form)) $form=new Form($db);
     	    $selected=-1;
-            $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"));
+            $searchform.=$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'vmenusearchselectcombo', 1, $langs->trans("Search"), 1);
 	    }
 	    else
 	    {
@@ -1770,7 +1764,6 @@ function left_menu($menu_array_before, $helppagename='', $notused='', $menu_arra
     print "\n";
     print '<!-- Begin right area -->'."\n";
 
-
     if (empty($leftmenuwithoutmainarea)) main_area($title);
 }
 
@@ -1892,6 +1885,7 @@ if (! function_exists("llxFooter"))
     /**
      * Show HTML footer
      * Close div /DIV data-role=page + /DIV class=fiche + /DIV /DIV main layout + /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
 	 * @param	string	$zone		'private' (for private pages) or 'public' (for public pages)
@@ -1900,7 +1894,8 @@ if (! function_exists("llxFooter"))
     function llxFooter($comment='',$zone='private')
     {
         global $conf, $langs;
-
+        global $delayedhtmlcontent;
+        
         // Global html output events ($mesgs, $errors, $warnings)
         dol_htmloutput_events();
 
@@ -1937,6 +1932,18 @@ if (! function_exists("llxFooter"))
         //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) && empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '</div> <!-- End div id-container -->'."\n";	// End div container
+        
+        if (! empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+        
+		// Wrapper to show tooltips
+		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(600,'width').'px", edgeOffset: 10, delay: 50, fadeIn: 50, fadeOut: 50});
+        	});
+        </script>' . "\n";
+
+        
         print "</body>\n";
         print "</html>\n";
     }
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 3b952b099ef..b409d0c752f 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref))
         print '<table class="border tableforfield" width="100%">';
 
 		// Total Margin
-		print '<tr><td>'.$langs->trans("TotalMargin").'</td><td colspan="3">';
+		print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
 		print '<span id="totalMargin"></span>'; // set by jquery (see below)
 		print '</td></tr>';
 
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index ba4dc432d36..3b653f9d919 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2207,7 +2207,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = d.fk_facture";
-		$sql.= " AND d.fk_product =".$this->id;
+		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND f.fk_soc = s.rowid";
 		$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;
@@ -2236,7 +2236,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = d.fk_facture_fourn";
-		$sql.= " AND d.fk_product =".$this->id;
+		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND f.fk_soc = s.rowid";
 		$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;
@@ -2265,7 +2265,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_propal";
-		$sql.= " AND d.fk_product =".$this->id;
+		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND p.fk_soc = s.rowid";
 		$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;
@@ -2292,7 +2292,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande 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 c.rowid = d.fk_commande";
-		$sql.= " AND d.fk_product =".$this->id;
+		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND c.fk_soc = s.rowid";
 		$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;
@@ -2319,7 +2319,7 @@ class Product extends CommonObject
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur 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 c.rowid = d.fk_commande";
-		$sql.= " AND d.fk_product =".$this->id;
+		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
 		$sql.= " AND c.fk_soc = s.rowid";
 		$sql.= " AND c.entity IN (".getEntity('commande_fournisseur', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 93a5c21862d..ecb3d12bb52 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -202,7 +202,7 @@ if ($object->id)
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border tableforfield" width="100%">';
 
-    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>';
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 5fe6d5a4be3..4203705cfee 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -38,7 +38,7 @@ $langs->load("products");
 $langs->load("bills");
 $langs->load("other");
 
-$id		= GETPOST('id','int');
+$id		= GETPOST('id','int');         // For this page, id can also be 'all'
 $ref	= GETPOST('ref');
 $mode	= (GETPOST('mode') ? GETPOST('mode') : 'byunit');
 $error	= 0;
@@ -56,16 +56,24 @@ $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','',
 /*
  *	View
  */
+ 
 $form = new Form($db);
 
-if (! empty($id) || ! empty($ref))
+if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 {
 	$object = new Product($db);
-	$result = $object->fetch($id,$ref);
-
-	llxHeader("","",$langs->trans("CardProduct".$object->type));
-
-	if ($result)
+    if (! empty($id) || ! empty($ref))
+    {
+        $result = $object->fetch($id,$ref);
+        llxHeader("",$langs->trans("CardProduct".$object->type));
+    }
+    else
+    {
+        llxHeader("",$langs->trans("ProductStatistics"));
+    }
+	
+    
+	if ($result && (! empty($id) || ! empty($ref)))
 	{
 		$head=product_prepare_head($object);
 		$titre=$langs->trans("CardProduct".$object->type);
@@ -73,37 +81,18 @@ if (! empty($id) || ! empty($ref))
 
 		dol_fiche_head($head, 'stats', $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,'ref','',1,'ref');
-		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_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
 		dol_fiche_end();
-
-
+	}
+	
+	
+	if ($result)
+	{
 		// Choice of stats
 		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='.$object->id.'&mode=byunit">';
+		if ($mode == 'bynumber') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&mode=byunit">';
 		else print img_picto('','tick').' ';
 		print $langs->trans("StatsByNumberOfUnits");
 		if ($mode == 'bynumber') print '</a>';
@@ -111,7 +100,7 @@ if (! empty($id) || ! empty($ref))
 		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='.$object->id.'&mode=bynumber">';
+		if ($mode == 'byunit') print '<a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&mode=bynumber">';
 		else print img_picto('','tick').' ';
 		print $langs->trans("StatsByNumberOfEntities");
 		if ($mode == 'byunit') print '</a>';
@@ -237,13 +226,13 @@ if (! empty($id) || ! empty($ref))
 			if ($graphfiles[$key]['output'] && ! $px->isGraphKo())
 			{
 			    if (file_exists($dir."/".$graphfiles[$key]['file']) && filemtime($dir."/".$graphfiles[$key]['file'])) print '<td>'.$langs->trans("GeneratedOn",dol_print_date(filemtime($dir."/".$graphfiles[$key]['file']),"dayhour")).'</td>';
-			    else print '<td>'.$langs->trans("GeneratedOn",dol_print_date(dol_now()),"dayhour").'</td>';
+			    else print '<td>'.$langs->trans("GeneratedOn",dol_print_date(dol_now(),"dayhour")).'</td>';
 			}
 			else
 			{
 				print '<td>'.($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")).'</td>';
 			}
-			print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
+			print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
 			print '</tr>';
 			print '</table>';
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index cdf571d7c75..69334976141 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -81,6 +81,8 @@ 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');
@@ -97,34 +99,22 @@ if ($id > 0 || ! empty($ref))
 		$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 '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($product,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-		print $product->getLibStatut(2,0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-		print $product->getLibStatut(2,1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		show_stats_for_company($product,$socid);
 
 		print "</table>";
 
-		print '</div>';
+        print '</div>';
+        print '<div style="clear:both"></div>';
+		
+		dol_fiche_end();
+		
 
 		if ($user->rights->commande->lire)
 		{
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index ef5352892c6..83f0912b3ee 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -86,16 +86,17 @@ if ($id > 0 || ! empty($ref)) {
 	$product = new Product($db);
 	$result = $product->fetch($id, $ref);
 
-	$parameters = array (
-			'id' => $id
-	);
+	$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');
 
 	llxHeader("", "", $langs->trans("CardProduct" . $product->type));
 
-	if ($result > 0) {
+	if ($result > 0) 
+	{
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct" . $product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
@@ -105,34 +106,22 @@ if ($id > 0 || ! empty($ref)) {
 		if ($reshook < 0)
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-		print '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">' . $langs->trans("Ref") . '</td><td colspan="3">';
-		print $form->showrefnav($product, 'ref', '', 1, 'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-		print '</div>';
+        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 9d4d7d53abc..c2e6b25f7ab 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -71,6 +71,8 @@ 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');
@@ -87,34 +89,22 @@ if ($id > 0 || ! empty($ref))
 		$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 '<table class="border" width="100%">';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($product,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-		print $product->getLibStatut(2,0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-		print $product->getLibStatut(2,1);
-		print '</td></tr>';
-
-		show_stats_for_company($product,$socid);
+        show_stats_for_company($product,$socid);
 
 		print "</table>";
 
-		print '</div>';
+        print '</div>';
+        print '<div style="clear:both"></div>';
+		
+		dol_fiche_end();
+		
 
 		$now=dol_now();
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index da39d5d67c1..590830702bb 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -81,7 +81,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');
@@ -98,34 +100,21 @@ if ($id > 0 || ! empty($ref))
 		$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 '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
-		print $form->showrefnav($product,'ref','',1,'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->label.'</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';
-		print $product->getLibStatut(2,0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';
-		print $product->getLibStatut(2,1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		show_stats_for_company($product,$socid);
 
 		print "</table>";
 
-		print '</div>';
+        print '</div>';
+        print '<div style="clear:both"></div>';
+		
+		dol_fiche_end();
 
 
         if ($user->rights->facture->lire) 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 3d5cbcbe455..27e5495a771 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -83,6 +83,8 @@ 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');
@@ -99,34 +101,22 @@ if ($id > 0 || ! empty($ref))
 		$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 '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">' . $langs->trans("Ref") . '</td><td colspan="3">';
-		print $form->showrefnav($product, 'ref', '', 1, 'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-		print '</div>';
+        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 44101d72e52..2fa69740e8b 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -81,6 +81,8 @@ 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');
@@ -97,34 +99,22 @@ if ($id > 0 || ! empty($ref))
 		$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 '<table class="border" width="100%">';
-
-		// Reference
-		print '<tr>';
-		print '<td width="30%">' . $langs->trans("Ref") . '</td><td colspan="3">';
-		print $form->showrefnav($product, 'ref', '', 1, 'ref');
-		print '</td>';
-		print '</tr>';
-
-		// Libelle
-		print '<tr><td>' . $langs->trans("Label") . '</td><td colspan="3">' . $product->label . '</td>';
-		print '</tr>';
-
-		// Status (to sell)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 0);
-		print '</td></tr>';
-
-		// Status (to buy)
-		print '<tr><td>' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')</td><td colspan="3">';
-		print $product->getLibStatut(2, 1);
-		print '</td></tr>';
+        dol_banner_tab($object, 'ref', '', ($user->societe_id?0:1), 'ref');
+        
+        print '<div class="fichecenter">';
+        
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
 
 		show_stats_for_company($product, $socid);
 
 		print "</table>";
 
-		print '</div>';
+        print '</div>';
+        print '<div style="clear:both"></div>';
+		
+		dol_fiche_end();
+		
 
 		if ($user->rights->propale->lire) 
 		{
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index c37424e548b..093a364752c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -399,14 +399,15 @@ if ($id > 0 || $ref)
         print '<div class="underbanner clearboth"></div>';
         print '<table class="border tableforfield" width="100%">';
 		
-		if ($conf->productbatch->enabled) {
-			print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td>';
+		if ($conf->productbatch->enabled) 
+		{
+			print '<tr><td class="titlefield">'.$langs->trans("ManageLotSerial").'</td><td>';
 			print $object->getLibStatut(0,2);
 			print '</td></tr>';
 		}
 
 		// PMP
-		print '<tr><td>'.$langs->trans("AverageUnitPricePMP").'</td>';
+		print '<tr><td class="titlefield">'.$langs->trans("AverageUnitPricePMP").'</td>';
 		print '<td>';
 		if ($object->pmp > 0) print price($object->pmp).' '.$langs->trans("HT");
 		print '</td>';
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index f1c00f94acf..7fec8e895b6 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -68,7 +68,6 @@ print "Test 4d: a select with ajax refresh and with onchange call of url<br>\n";
 $selected=-1;
 print $form->selectArrayAjax('testselectc', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, 'style="min-width: 250px;"', '', 0, 1, '', 1);
 
-
 print '<br><br>'."\n";
 
 // Test5a: form->select_thirdparty

From 4e64230ac975ee04cef10080b38652923acee35f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 16:25:14 +0100
Subject: [PATCH 198/216] NEW Add chart of product statistics

---
 htdocs/core/menus/standard/eldy.lib.php |   4 +-
 htdocs/product/popuprop.php             |  58 +++++++------
 htdocs/product/stats/card.php           | 107 +++++++++++++++++++++---
 3 files changed, 130 insertions(+), 39 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 099d65f7f95..6d31fbc52f6 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1088,7 +1088,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				}
 				if (! empty($conf->propal->enabled))
 				{
-					$newmenu->add("/product/popuprop.php?leftmenu=stats&amp;type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
+					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
 				}
 			}
 
@@ -1100,7 +1100,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
 				if (! empty($conf->propal->enabled))
 				{
-					$newmenu->add("/product/popuprop.php?leftmenu=stats&amp;type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);
+					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);
 				}
 			}
 
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index c8da665dd98..aad606627cb 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -38,18 +38,16 @@ $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;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
 $page = GETPOST("page",'int');
-if ($page < 0) $page = 0;
+if ($page == -1) { $page = 0; }
 if (! $sortfield) $sortfield="c";
 if (! $sortorder) $sortorder="DESC";
-
-$conf->liste_limit = 3;
-
-if ($page == -1) $page = 0;
-$limit = $conf->liste_limit;
 $offset = $limit * $page ;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
 
 $staticproduct=new Product($db);
@@ -69,7 +67,13 @@ if ($type == '0')
 else if ($type == '1')
 {
     $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
-    $title=$langs->trans("StatisticsOfServices");
+    //$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");
 }
 
@@ -80,24 +84,30 @@ print load_fiche_titre($title, $mesg,'title_products.png');
 
 $param = '';
 $title = $langs->trans("ListProductServiceByPopularity");
-if ($type != '') {
-	$param = '&type='.$type;
-
-	if ($type == 1) {
-		$title = $langs->trans("ListServiceByPopularity");
-	} else {
-		$title = $langs->trans("ListProductByPopularity");
-	}
+if ((string) $type == '1') {
+	$title = $langs->trans("ListServiceByPopularity");
 }
+if ((string) $type == '0') {
+	$title = $langs->trans("ListProductByPopularity");
+}
+
+if ($type != '') $param .= '&type='.$type;
+
 
 $h=0;
 $head = array();
-$head[$h][0] = $_SERVER['PHP_SELF'];
-$head[$h][1] = $title;
-$head[$h][2] = 'product';
+
+$head[$h][0] = DOL_URL_ROOT.'/product/stats/card.php?id=all';
+$head[$h][1] = $langs->trans("Chart");
+$head[$h][2] = 'chart';
 $h++;
 
-dol_fiche_head($head,'product',$langs->trans("Statistics"));
+$head[$h][0] = $_SERVER['PHP_SELF'];
+$head[$h][1] = $title;
+$head[$h][2] = 'popularityprop';
+$h++;
+
+dol_fiche_head($head,'popularityprop',$langs->trans("Statistics"));
 
 
 
@@ -127,15 +137,15 @@ if ($result)
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num, $totalnboflines, '');
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, "", $num, $totalnboflines, '');
 
 	print '<table class="noborder" width="100%">';
 
 	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder);
-	print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.fk_product_type', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', $param, 'align="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 4203705cfee..33390e51a70 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -62,14 +62,38 @@ $form = new Form($db);
 if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 {
 	$object = new Product($db);
-    if (! empty($id) || ! empty($ref))
+    if (GETPOST('id') == 'all')
     {
-        $result = $object->fetch($id,$ref);
-        llxHeader("",$langs->trans("CardProduct".$object->type));
+        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');
     }
     else
     {
-        llxHeader("",$langs->trans("ProductStatistics"));
+        $result = $object->fetch($id,$ref);
+        llxHeader("",$langs->trans("CardProduct".$object->type));
     }
 	
     
@@ -85,14 +109,70 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
         
 		dol_fiche_end();
 	}
-	
-	
-	if ($result)
+	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">';
+    		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">';
+    		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).'">';
+    		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
 		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).'&mode=byunit">';
+		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>';
@@ -100,7 +180,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 		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).'&mode=bynumber">';
+		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>';
@@ -255,10 +335,11 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 			print "\n".'</div></div></div>';
 			print '<div class="clear"><div class="fichecenter"><br></div></div>'."\n";
 		}
-
-		print '<div class="tabsAction">';
-		print '</div>';
-
+	}
+	
+	if (GETPOST('id') == 'all')
+	{
+	    dol_fiche_end();
 	}
 }
 else

From 198f8102fadbd61c3fe890860d08755506c3b542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 7 Nov 2015 16:46:15 +0100
Subject: [PATCH 199/216] FIX #3941 Error installing Dolibarr develop

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

diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
index 16e8a624e72..b728702db79 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
@@ -29,5 +29,5 @@ CREATE TABLE llx_opensurvey_sondage (
 	allow_comments tinyint NOT NULL DEFAULT 1,
 	allow_spy tinyint NOT NULL DEFAULT 1,
 	tms TIMESTAMP,
-	sujet TEXT,									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
+	sujet TEXT									-- Not filled if format = 'F'. Question are into table llx_opensurvey_formquestions
 ) ENGINE=InnoDB;

From b34edeb751fe43e5bf3a9ba045e3e605436c8efb Mon Sep 17 00:00:00 2001
From: philippe grand <philippe.grand@atoo-net.com>
Date: Sat, 7 Nov 2015 21:56:21 +0100
Subject: [PATCH 200/216] [Qual] Uniformize code

---
 htdocs/comm/address.php        |  4 ++--
 htdocs/comm/card.php           | 10 +++++-----
 htdocs/comm/mailing/card.php   |  2 +-
 htdocs/comm/propal.php         | 36 +++++++++++++++++-----------------
 htdocs/comm/propal/contact.php | 16 +++++++--------
 htdocs/comm/remx.php           | 16 +++++++--------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index eb3c51b1760..edb5042e358 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -106,7 +106,7 @@ if ($action == 'add' || $action == 'update')
         }
         else
         {
-	        setEventMessage($object->error, 'errors');
+	        setEventMessages($object->error, $object->errors, 'errors');
             $action='create';
         }
     }
@@ -147,7 +147,7 @@ if ($action == 'add' || $action == 'update')
         else
         {
             $reload = 0;
-	        setEventMessage($object->error, 'errors');
+	        setEventMessages($object->error, $object->errors, 'errors');
             $action= "edit";
         }
     }
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index b874eeefde5..3083ac9505c 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -105,7 +105,7 @@ if (empty($reshook))
 		$result=$object->fetch($id);
 		$object->code_compta=$_POST["customeraccountancycode"];
 		$result=$object->update($object->id,$user,1,1,0);
-		if ($result < 0) setEventMessage($object->error,$object->errors,'errors');
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// conditions de reglement
@@ -113,7 +113,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 		$result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
-		if ($result < 0) setEventMessage($object->error,$object->errors,'errors');
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// mode de reglement
@@ -121,7 +121,7 @@ if (empty($reshook))
 	{
 		$object->fetch($id);
 		$result=$object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
-		if ($result < 0) setEventMessage($object->error,$object->errors,'errors');
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// assujetissement a la TVA
@@ -130,7 +130,7 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->tva_assuj=$_POST['assujtva_value'];
 		$result=$object->update($object->id);
-		if ($result < 0) setEventMessage($object->error,$object->errors,'errors');
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	// set prospect level
@@ -157,7 +157,7 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->outstanding_limit=GETPOST('outstanding_limit');
 		$result=$object->set_OutstandingBill($user);
-		if ($result < 0) setEventMessage($object->error,$object->errors,'errors');
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 2a892033865..e54aeb1c8a5 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -359,7 +359,7 @@ if (empty($reshook))
 				{
 					$statut=2;	// Status 'sent partially' (because at least one error)
 					if ($nbok > 0) 	setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
-					else setEventMessage($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
+					else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients",$nbok), null, 'mesgs');
 				}
 				else
 				{
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 408d01d8eaa..1107e3b9b4d 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
- * Copyright (C) 2010-2011 Philippe Grand        <philippe.grand@atoo-net.com>
+ * Copyright (C) 2010-2015 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013-2014 Florian Henry		 <florian.henry@open-concept.pro>
@@ -131,7 +131,7 @@ if (empty($reshook))
 	{
 		if (! GETPOST('socid', 3))
 		{
-			setEventMessage($langs->trans("NoCloneOptionsSpecified"), 'errors');
+			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		}
 		else
 		{
@@ -141,7 +141,7 @@ if (empty($reshook))
 					header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $result);
 					exit();
 				} else {
-					if (count($object->errors) > 0) setEventMessage($object->errors, 'errors');
+					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
 					$action = '';
 				}
 			}
@@ -157,7 +157,7 @@ if (empty($reshook))
 			exit();
 		} else {
 			$langs->load("errors");
-			setEventMessage($langs->trans($object->error), 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
@@ -211,8 +211,8 @@ if (empty($reshook))
 			}
 		} else {
 			$langs->load("errors");
-			if (count($object->errors) > 0) setEventMessage($object->errors, 'errors');
-			else setEventMessage($langs->trans($object->error), 'errors');
+			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+			else setEventMessages($langs->trans($object->error), null, 'errors');
 		}
 	}
 
@@ -318,7 +318,7 @@ if (empty($reshook))
 
 					$id = $object->create_from($user);
 				} else {
-					setEventMessage($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), 'errors');
+					setEventMessages($langs->trans("ErrorFailedToCopyProposal", GETPOST('copie_propal')), null, 'errors');
 				}
 			} else {
 				$object->ref = GETPOST('ref');
@@ -507,7 +507,7 @@ if (empty($reshook))
 						if ($result < 0)
 						{
 							$error++;
-							setEventMessage($langs->trans("ErrorFailedToAddContact"), 'errors');
+							setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
 						}
 					}
 
@@ -671,7 +671,7 @@ if (empty($reshook))
 			if ($object->id > 0) {
 				$result = $object->insert_discount($_POST["remise_id"]);
 				if ($result < 0) {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -875,7 +875,7 @@ if (empty($reshook))
 
 			if (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-				setEventMessage($mesg, 'errors');
+				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit);
@@ -929,13 +929,13 @@ if (empty($reshook))
 				} else {
 					$db->rollback();
 
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
 	}
 
-	// Mise a jour d'une ligne dans la propale
+	// Update a line within proposal
 	else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('save'))
 	{
 		// Define info_bits
@@ -991,7 +991,7 @@ if (empty($reshook))
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			if ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent')) / 100) < price2num($price_min))) {
-				setEventMessage($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), 'errors');
+				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error ++;
 			}
 		} else {
@@ -1040,7 +1040,7 @@ if (empty($reshook))
 			} else {
 				$db->rollback();
 
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
@@ -1137,9 +1137,9 @@ if (empty($reshook))
 			} else {
 				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("errors");
-					setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				} else {
-					setEventMessage($object->error, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -1636,13 +1636,13 @@ if ($action == 'create')
 	else if ($action == 'validate') {
 		$error = 0;
 
-		// on verifie si l'objet est en numerotation provisoire
+		// We verifie whether the object is provisionally numbering
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV') {
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error ++;
-				setEventMessage($object->error, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		} else {
 			$numref = $object->ref;
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index 6a0a1076e62..544c5ab27e3 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
  * Copyright (C) 2005-2009 Destailleur Laurent  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@capnetworks.com>
- * Copyright (C) 2011-2012 Philippe Grand       <philippe.grand@atoo-net.com>
+ * Copyright (C) 2011-2015 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
@@ -54,12 +54,12 @@ if ($id > 0 || ! empty($ref))
 	if ($ret == 0)
 	{
 		$langs->load("errors");
-		setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors');
+		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
 	}
 	else if ($ret < 0)
 	{
-		setEventMessage($object->error, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
 	}
 }
@@ -75,7 +75,7 @@ else
 
 
 /*
- * Ajout d'un nouveau contact
+ * Add a new contact
  */
 
 if ($action == 'addcontact' && $user->rights->propale->creer)
@@ -96,16 +96,16 @@ if ($action == 'addcontact' && $user->rights->propale->creer)
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
-			setEventMessage($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), 'errors');
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		}
 		else
 		{
-			setEventMessage($object->error, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }
 
-// Bascule du statut d'un contact
+// Toggle the status of a contact
 else if ($action == 'swapstatut' && $user->rights->propale->creer)
 {
 	if ($object->id > 0)
@@ -114,7 +114,7 @@ else if ($action == 'swapstatut' && $user->rights->propale->creer)
 	}
 }
 
-// Efface un contact
+// Deletes a contact
 else if ($action == 'deletecontact' && $user->rights->propale->creer)
 {
 	$result = $object->delete_contact($lineid);
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index e472c5fb848..ba85d593fce 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -65,17 +65,17 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 	if (! $res > 0)
 	{
 		$error++;
-		setEventMessage($langs->trans("ErrorFailedToLoadDiscount"), 'errors');
+		setEventMessages($langs->trans("ErrorFailedToLoadDiscount"), null, 'errors');
 	}
 	if (! $error && price2num($_POST["amount_ttc_1"]+$_POST["amount_ttc_2"]) != $discount->amount_ttc)
 	{
 		$error++;
-		setEventMessage($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), 'errors');
+		setEventMessages($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), null, 'errors');
 	}
 	if (! $error && $discount->fk_facture_line)
 	{
 		$error++;
-		setEventMessage($langs->trans("ErrorCantSplitAUsedDiscount"), 'errors');
+		setEventMessages($langs->trans("ErrorCantSplitAUsedDiscount"), null, 'errors');
 	}
 	if (! $error)
 	{
@@ -166,13 +166,13 @@ if ($action == 'setremise')
 			else
 			{
 				$error++;
-				setEventMessage($soc->error, 'errors');
+				setEventMessages($soc->error, $soc->errors, 'errors');
 			}
 		}
 	}
 	else
 	{
-		setEventMessage($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), 'errors');
+		setEventMessages($langs->trans("ErrorFieldFormat",$langs->trans("NewGlobalDiscount")), null, 'errors');
 	}
 }
 
@@ -194,7 +194,7 @@ if (GETPOST("action") == 'confirm_remove' && GETPOST("confirm")=='yes')
 	}
 	else
 	{
-		setEventMessage($discount->error, 'errors');
+		setEventMessages($discount->error, $discount->errors, 'errors');
 		$db->rollback();
 	}
 }
@@ -216,7 +216,7 @@ if ($socid > 0)
 	$object->fetch($socid);
 
 	/*
-	 * Affichage onglets
+	 * Display tabs
 	 */
 	$head = societe_prepare_head($object);
 
@@ -300,7 +300,7 @@ if ($socid > 0)
 	}
 
 	/*
-	 * Liste remises fixes restant en cours (= liees a acune facture ni ligne de facture)
+	 * Liste remises fixes restant en cours (= liees a aucune facture ni ligne de facture)
 	 */
 	$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
 	$sql.= " rc.datec as dc, rc.description,";

From 3906cb79c5bb49236721558c44d76ce48197bacf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 23:41:45 +0100
Subject: [PATCH 201/216] NEW: Add parameter to add a link to use "date of
 invoice" in one click when fille a payment card.

---
 htdocs/compta/facture/class/facture.class.php |  1 +
 htdocs/compta/paiement.php                    |  2 +-
 htdocs/core/class/html.form.class.php         | 10 +++++++++-
 htdocs/fourn/facture/paiement.php             |  8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ede68b39324..ca7afeb7959 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -63,6 +63,7 @@ class Facture extends CommonInvoice
 	var $author;
 	var $fk_user_author;
 	var $fk_user_valid;
+	var $date;              // Date invoice
 	var $date_creation;		// Creation date
 	var $date_validation;	// Validation date
 	var $datem;
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 7466686239a..8c028b23aaa 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -415,7 +415,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         print '<tr><td><span class="fieldrequired">'.$langs->trans('Date').'</span></td><td>';
         $datepayment = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
         $datepayment= ($datepayment == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE)?-1:'') : $datepayment);
-        $form->select_date($datepayment,'','','',0,"add_paiement",1,1);
+        $form->select_date($datepayment,'','','',0,"add_paiement",1,1,0,0,'','',$facture->date);
         print '</td>';
         print '<td>'.$langs->trans('Comments').'</td></tr>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6c586ffe9b7..d64b9971a27 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4057,10 +4057,11 @@ class Form
      * 	@param 	int			$disabled		Disable input fields
      *  @param  int			$fullday        When a checkbox with this html name is on, hour and day are set with 00:00 or 23:59
      *  @param	string		$addplusone		Add a link "+1 hour". Value must be name of another select_date field.
+     *  @param  datetime    $adddateof      Add a link "Date of invoice" using the following date.
      * 	@return	mixed						Nothing or string if nooutput is 1
      *  @see	form_date
      */
-    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='')
+    function select_date($set_time='', $prefix='re', $h=0, $m=0, $empty=0, $form_name="", $d=1, $addnowlink=0, $nooutput=0, $disabled=0, $fullday='', $addplusone='', $adddateof='')
     {
         global $conf,$langs;
 
@@ -4318,6 +4319,13 @@ class Form
             }
         }
 
+        // Add a "Plus one hour" link
+        if ($conf->use_javascript_ajax && $adddateof)
+        {
+            $tmparray=dol_getdate($adddateof);
+            $retstring.=' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof,'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$langs->trans("DateInvoice").'</a>';
+        }    
+
         if (! empty($nooutput)) return $retstring;
 
         print $retstring;
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 76497bf4300..82bccf3df19 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -257,7 +257,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     $dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture);
 
     $sql = 'SELECT s.nom as name, s.rowid as socid,';
-    $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total';
+    $sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total, fk_mode_reglement, fk_account';
     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.'facture_fourn as f';
     if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -292,11 +292,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             print $supplierstatic->getNomUrl(1,'supplier');
             print '</td></tr>';
             print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
-            $form->select_date($dateinvoice,'','','','',"addpaiement",1,1);
+            $form->select_date($dateinvoice,'','','','',"addpaiement",1,1,0,0,'','',$object->date);
             print '</td>';
             print '<td>'.$langs->trans('Comments').'</td></tr>';
             print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
-            $form->select_types_paiements(empty($_POST['paiementid'])?'':$_POST['paiementid'],'paiementid');
+            $form->select_types_paiements(empty($_POST['paiementid'])?$obj->fk_mode_reglement:$_POST['paiementid'],'paiementid');
             print '</td>';
             print '<td rowspan="3" valign="top">';
             print '<textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_3.'">'.(empty($_POST['comment'])?'':$_POST['comment']).'</textarea></td></tr>';
@@ -304,7 +304,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
             if (! empty($conf->banque->enabled))
             {
                 print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
-                $form->select_comptes(empty($accountid)?'':$accountid,'accountid',0,'',2);
+                $form->select_comptes(empty($accountid)?$obj->fk_account:$accountid,'accountid',0,'',2);
                 print '</td></tr>';
             }
             else

From 031b33d582588aa44c4aac329715f25cba45a3da Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 7 Nov 2015 23:54:11 +0100
Subject: [PATCH 202/216] FIX Checkbox reconciliated no correctly checked with
 some Chrome versions

---
 htdocs/compta/bank/ligne.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index f1bb4eb9a62..d210e209b59 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-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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      Alexandre Spangaro	<aspangaro.dolibarr@gmail.com>
@@ -587,7 +587,7 @@ if ($result)
             if ($user->rights->banque->consolidate)
             {
                 print '<td colspan="3">';
-                print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"])?($_POST["reconciled"]?' checked':''):($objp->rappro?' checked':'')).'">';
+                print '<input type="checkbox" name="reconciled" class="flat" '.(isset($_POST["reconciled"])?($_POST["reconciled"]?' checked="checked"':''):($objp->rappro?' checked="checked"':'')).'">';
                 print '</td>';
             }
             else

From b5c9602da426b590429bb458780e180314a5c107 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 00:08:50 +0100
Subject: [PATCH 203/216] Fix Use new look for left-right arrow

---
 htdocs/compta/bank/releve.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 9620b00098b..cd8442114dc 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -282,9 +282,14 @@ else
 		$found=true;
 	}
 
-	$mesprevnext ="<a href=\"releve.php?rel=prev&amp;num=$num&amp;ve=$ve&amp;account=$object->id\">".img_previous()."</a> &nbsp;";
-	$mesprevnext.= $langs->trans("AccountStatement")." $num";
-	$mesprevnext.=" &nbsp; <a href=\"releve.php?rel=next&amp;num=$num&amp;ve=$ve&amp;account=$object->id\">".img_next()."</a>";
+    $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.=' &nbsp; ';
+	$mesprevnext.='<li class="pagination"><span class="inactive">'.$langs->trans("AccountStatement")." ".$num.'</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.='</ul></div>';
 	print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png');
 	print '<br>';
 

From 24dff1d8424dbbfcf0edee34ebc0ca9d261928ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 00:35:30 +0100
Subject: [PATCH 204/216] NEW Statistic graphs on products offer a filter on
 product type (product / service or both)

---
 htdocs/core/menus/init_menu_auguria.sql |  4 +-
 htdocs/product/class/product.class.php  | 59 ++++++++++++++++---------
 htdocs/product/stats/card.php           | 35 +++++++++------
 3 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index df0b9e46488..a75be746ad1 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -98,12 +98,12 @@ 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->product->enabled', __HANDLER__, 'left', 2802__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/list.php?leftmenu=product&amp;type=0', 'List', 1, 'products', '$user->rights->produit->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->product->enabled', __HANDLER__, 'left', 2803__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassort.php?type=0', 'Stocks', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->productbatch->enabled', __HANDLER__, 'left', 2805__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/reassortlot.php?type=0', 'StocksByLotSerial', 1, 'products', '$user->rights->produit->lire && $user->rights->stock->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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 6, __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->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 6, __ENTITY__);
 -- Product - Services
 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->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?leftmenu=service&amp;type=1', 'Services', 0, 'products', '$user->rights->service->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->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?leftmenu=service&amp;action=create&amp;type=1', 'NewService', 1, 'products', '$user->rights->service->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->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?leftmenu=service&amp;type=1', 'List', 1, 'products', '$user->rights->service->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->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/popuprop.php?leftmenu=stats&amp;type=1', 'Statistics', 1, 'main', '$user->rights->service->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->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/stats/card.php?id=all&amp;leftmenu=stats&amp;type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__);
 -- Product - Stocks
 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->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->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->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__);
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3b653f9d919..4594baab7a2 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2193,11 +2193,12 @@ class Product extends CommonObject
 	/**
 	 *  Return nb of units or customers invoices in which product is included
 	 *
-	 *  @param  	int		$socid      Limit count on a particular third party id
-	 *  @param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
-	 * 	@return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 *  @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
+	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_vente($socid,$mode)
+	function get_nb_vente($socid, $mode, $filteronproducttype=-1)
 	{
 		global $conf;
 		global $user;
@@ -2205,9 +2206,11 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
+		if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = d.fk_facture";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
+		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).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2222,11 +2225,12 @@ class Product extends CommonObject
 	/**
 	 *  Return nb of units or supplier invoices in which product is included
 	 *
-	 *  @param  	int		$socid      Limit count on a particular third party id
-	 * 	@param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
-	 * 	@return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 *  @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
+	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_achat($socid,$mode)
+	function get_nb_achat($socid, $mode, $filteronproducttype=-1)
 	{
 		global $conf;
 		global $user;
@@ -2234,9 +2238,11 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(f.datef, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT f.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as p";
+        if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE f.rowid = d.fk_facture_fourn";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
+		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).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2251,11 +2257,12 @@ class Product extends CommonObject
 	/**
 	 *  Return nb of units or proposals in which product is included
 	 *
-	 *  @param  	int		$socid      Limit count on a particular third party id
-	 * 	@param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
-	 * 	@return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 *  @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
+	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_propal($socid,$mode)
+	function get_nb_propal($socid, $mode, $filteronproducttype=-1)
 	{
 		global $conf;
 		global $user;
@@ -2263,9 +2270,11 @@ class Product extends CommonObject
 		$sql = "SELECT sum(d.qty), date_format(p.datep, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT p.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $sql.=", ".MAIN_DB_PREFIX."product as prod";		
 		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql.= " WHERE p.rowid = d.fk_propal";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
+		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).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2279,20 +2288,23 @@ class Product extends CommonObject
 	/**
 	 *  Return nb of units or orders in which product is included
 	 *
-	 *  @param  	int		$socid      Limit count on a particular third party id
-	 *  @param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
-	 * 	@return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 *  @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
+	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_order($socid,$mode)
+	function get_nb_order($socid, $mode, $filteronproducttype=-1)
 	{
 		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        if ($filteronproducttype >= 0) $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.rowid = d.fk_commande";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
+		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).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
@@ -2306,20 +2318,23 @@ class Product extends CommonObject
 	/**
 	 *  Return nb of units or orders in which product is included
 	 *
-	 *  @param  	int		$socid      Limit count on a particular third party id
-	 *  @param		string	$mode		'byunit'=number of unit, 'bynumber'=nb of entities
-	 * 	@return   	array       		<0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
+	 *  @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
+	 * 	@return   	array       		             <0 if KO, result[month]=array(valuex,valuey) where month is 0 to 11
 	 */
-	function get_nb_ordersupplier($socid,$mode)
+	function get_nb_ordersupplier($socid, $mode, $filteronproducttype=-1)
 	{
 		global $conf, $user;
 
 		$sql = "SELECT sum(d.qty), date_format(c.date_commande, '%Y%m')";
 		if ($mode == 'bynumber') $sql.= ", count(DISTINCT c.rowid)";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";
+        if ($filteronproducttype >= 0) $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.rowid = d.fk_commande";
 		if ($this->id > 0) $sql.= " AND d.fk_product =".$this->id;
+		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_fournisseur', 1).")";
 		if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id;
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index 33390e51a70..79d33b1d884 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -27,6 +27,7 @@
 
 require '../../main.inc.php';
 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';
 
@@ -204,19 +205,19 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 
 		$graphfiles=array(
 		'propal'           =>array('modulepart'=>'productstats_proposals',
-		'file' => $object->id.'/propal12m.png',
+		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
 		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsProposals"):$langs->transnoentitiesnoconv("NumberOfProposals"))),
 		'orders'           =>array('modulepart'=>'productstats_orders',
-		'file' => $object->id.'/orders12m.png',
+		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
 		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders"):$langs->transnoentitiesnoconv("NumberOfCustomerOrders"))),
 		'invoices'         =>array('modulepart'=>'productstats_invoices',
-		'file' => $object->id.'/invoices12m.png',
+		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
 		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices"):$langs->transnoentitiesnoconv("NumberOfCustomerInvoices"))),
 		'orderssuppliers'=>array('modulepart'=>'productstats_orderssuppliers',
-		'file' => $object->id.'/orderssuppliers12m.png',
+		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
 		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders"):$langs->transnoentitiesnoconv("NumberOfSupplierOrders"))),
 		'invoicessuppliers'=>array('modulepart'=>'productstats_invoicessuppliers',
-		'file' => $object->id.'/invoicessuppliers12m.png',
+		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.'.png',
 		'label' => ($mode=='byunit'?$langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices"):$langs->transnoentitiesnoconv("NumberOfSupplierInvoices"))),
 		);
 
@@ -233,13 +234,21 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 
 					$graph_data = array();
 
-					// TODO Test si deja existant et recent, on ne genere pas
-					if ($key == 'propal')            $graph_data = $object->get_nb_propal($socid,$mode);
-					if ($key == 'orders')            $graph_data = $object->get_nb_order($socid,$mode);
-					if ($key == 'invoices')          $graph_data = $object->get_nb_vente($socid,$mode);
-					if ($key == 'invoicessuppliers') $graph_data = $object->get_nb_achat($socid,$mode);
-					if ($key == 'orderssuppliers')   $graph_data = $object->get_nb_ordersupplier($socid,$mode);
-
+					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 == '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);
@@ -312,7 +321,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
 			{
 				print '<td>'.($mesg?'<font class="error">'.$mesg.'</font>':$langs->trans("ChartNotGenerated")).'</td>';
 			}
-			print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.(GETPOST('id')?GETPOST('id'):$object->id).'&amp;action=recalcul&amp;mode='.$mode.'">'.img_picto($langs->trans("ReCalculate"),'refresh').'</a></td>';
+			print '<td align="center"><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"),'refresh').'</a></td>';
 			print '</tr>';
 			print '</table>';
 

From e350b759d3c420ad50f3d1d7ed29c66c9c68670e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 00:52:25 +0100
Subject: [PATCH 205/216] Increase number of last bank receits visible links

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

diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 2bafa7e780e..a8791177954 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -186,7 +186,7 @@ if ($resql)
     print '<br>';
 
     // Show last bank receipts
-    $nbmax=5;
+    $nbmax=15;      // We accept to show last 15 receipts (so we can have more than one year)
     $liste="";
     $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
     $sql.= " WHERE fk_account=".$acct->id." AND num_releve IS NOT NULL";

From fa8863d2eac449b2105419f610afae5c84ef9d66 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 01:38:03 +0100
Subject: [PATCH 206/216] Fix sql migration requests

---
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql       | 3 +--
 htdocs/install/mysql/tables/llx_budget_lines.key.sql | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 0705512893e..a846eeff889 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -235,13 +235,12 @@ create table llx_budget_lines
   import_key    integer  
 )ENGINE=innodb;
 
-ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project);
+ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project_ids);
 
 -- Supprime orphelins pour permettre montee de la cle
 -- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL;
 -- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget);
 
-ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project);
 ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid);
 
 
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.key.sql b/htdocs/install/mysql/tables/llx_budget_lines.key.sql
index 9a9771570b1..b31e74b324d 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.key.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.key.sql
@@ -17,11 +17,10 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project);
+ALTER TABLE llx_budget_lines ADD UNIQUE INDEX uk_budget_lines (fk_budget, fk_project_ids);
 
 -- Supprime orphelins pour permettre montee de la cle
 -- MYSQL V4 DELETE llx_budget_lines FROM llx_budget_lines LEFT JOIN llx_budget ON llx_budget.rowid = llx_budget_lines.fk_budget WHERE llx_budget_lines.rowid IS NULL;
 -- POSTGRESQL V8 DELETE FROM llx_budget_lines USING llx_budget WHERE llx_budget_lines.fk_budget NOT IN (SELECT llx_budget.rowid FROM llx_budget);
 
-ALTER TABLE llx_budget_lines ADD INDEX idx_budget_lines (fk_project);
 ALTER TABLE llx_budget_lines ADD CONSTRAINT fk_budget_lines_budget FOREIGN KEY (fk_budget) REFERENCES llx_budget (rowid);

From 7a423c04d4e32deb5bf7d1437aa893649188b72f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 02:00:28 +0100
Subject: [PATCH 207/216] Fix The only default value is value we just entered

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

diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index a8791177954..332e7fffe60 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -226,7 +226,7 @@ if ($resql)
 	print '<input type="hidden" name="account" value="'.$acct->id.'">';
 
     print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
-    print '<input class="flat" name="num_releve" type="text" value="'.(GETPOST('num_releve')?GETPOST('num_releve'):$last_releve).'" size="10">';
+    print '<input class="flat" name="num_releve" type="text" value="'.(GETPOST('num_releve')?GETPOST('num_releve'):'').'" size="10">';  // The only default value is value we just entered
     print '<br>';
     if ($options)
     {

From 333dd108747b65a8269e9fbb2087688f74c28ca1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 02:09:32 +0100
Subject: [PATCH 208/216] Add a way to lin on bank receipt tab directly

---
 htdocs/compta/bank/account.php             | 27 +++++++++++-----------
 htdocs/compta/bank/class/account.class.php |  7 +++++-
 htdocs/compta/bank/releve.php              |  2 +-
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index e3bc2a3fc2c..b9c0d3821bc 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -378,19 +378,6 @@ if ($id > 0 || ! empty($ref))
 	{
 		print '<div class="tabsAction">';
 
-		if ($object->type != 2 && $object->rappro) 
-		{ 
-			// If not cash account and can be reconciliate
-			if ($user->rights->banque->consolidate) 
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
-			}
-			else
-			{
-				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
-			}
-		}
-
 		if ($action != 'addline') 
 		{
 			if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) 
@@ -409,6 +396,20 @@ if ($id > 0 || ! empty($ref))
                 print '<a class="butActionRefused" title="'.$langs->trans("FeatureDisabled").'" href="#">'.$langs->trans("AddBankRecord").'</a>';
             }
         }
+
+		if ($object->type != 2 && $object->rappro) 
+		{ 
+			// If not cash account and can be reconciliate
+			if ($user->rights->banque->consolidate) 
+			{
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/rappro.php?account='.$object->id.($vline?'&amp;vline='.$vline:'').'">'.$langs->trans("Conciliate").'</a>';
+			}
+			else
+			{
+				print '<a class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+			}
+		}
+
         print '</div>';
     }
 	
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e8978310ca3..65661b3cce8 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -998,7 +998,12 @@ class Account extends CommonObject
             $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/account.php?account='.$this->id.$linkclose;
             $linkend='</a>';
         }
-
+        else if ($mode == 'receipts')
+        {
+            $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id.$linkclose;
+            $linkend='</a>';
+        }
+        
         if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' ');
         $result.=$link.$this->label.$linkend;
         return $result;
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index cd8442114dc..88defbd8b04 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -290,7 +290,7 @@ else
 	//$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.='</ul></div>';
-	print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0),$mesprevnext, 'title_bank.png');
+	print load_fiche_titre($langs->trans("AccountStatement").' '.$num.', '.$langs->trans("BankAccount").' : '.$object->getNomUrl(0, 'receipts'), $mesprevnext, 'title_bank.png');
 	print '<br>';
 
 	print "<form method=\"post\" action=\"releve.php\">";

From 1d2dab63a34a5eeefabb49b42324fa6ac019de96 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 02:32:22 +0100
Subject: [PATCH 209/216] More space

---
 htdocs/compta/bank/releve.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 88defbd8b04..84c2edde0dd 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -157,6 +157,7 @@ if (empty($num))
 		}
 
 		print '</div>';
+		print '<br><br>';
 		
 
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], "&account=".$object->id, $sortfield, $sortorder,'',$numrows);

From 04243510f3996d62957d64ea5ac82b101454d6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 8 Nov 2015 14:54:29 +0100
Subject: [PATCH 210/216] Little changes

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

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index be23fa6f06c..64068652ca9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4089,11 +4089,15 @@ class Product extends CommonObject
 		return 1;
 	}
 
+	/**
+	 * Returns the rights used for this class
+	 * @return stdClass
+	 */
 	public function getRights()
 	{
 		global $user;
 
-		if ($this->isproduct()) {
+		if ($this->isProduct()) {
 			return $user->rights->produit;
 		} else {
 			return $user->rights->service;

From bd56396394bb235e9b8303cd9d197ba8838ece3f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 8 Nov 2015 15:38:57 +0100
Subject: [PATCH 211/216] Fix migration error

---
 htdocs/core/class/html.form.class.php                     | 1 +
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql            | 2 +-
 htdocs/install/mysql/tables/llx_categorie_project.key.sql | 2 +-
 3 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 d64b9971a27..393560b4640 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4533,6 +4533,7 @@ class Form
         
     	$out='<input type="text" class="'.$htmlname.($morecss?' '.$morecss:'').'" '.($moreparam?$moreparam.' ':'').'name="'.$htmlname.'">';
     	
+    	// TODO Use an internal dolibarr component instead of select2
     	$outdelayed='<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->
 	    	<script type="text/javascript">
 	    	$(document).ready(function () {
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index a846eeff889..8a00cffb811 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -300,7 +300,7 @@ ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (
 ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project);
 
 ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project   FOREIGN KEY (fk_project) REFERENCES llx_project (rowid);
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project   FOREIGN KEY (fk_project) REFERENCES llx_projet (rowid);
 
 
 
diff --git a/htdocs/install/mysql/tables/llx_categorie_project.key.sql b/htdocs/install/mysql/tables/llx_categorie_project.key.sql
index 12532b6eb09..f92e86ff6e9 100644
--- a/htdocs/install/mysql/tables/llx_categorie_project.key.sql
+++ b/htdocs/install/mysql/tables/llx_categorie_project.key.sql
@@ -21,4 +21,4 @@ ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_categorie (
 ALTER TABLE llx_categorie_project ADD INDEX idx_categorie_project_fk_project (fk_project);
 
 ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
-ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project   FOREIGN KEY (fk_project) REFERENCES llx_project (rowid);
+ALTER TABLE llx_categorie_project ADD CONSTRAINT fk_categorie_project_fk_project_rowid FOREIGN KEY (fk_project) REFERENCES llx_projet (rowid);

From 7ebe032d6fe25b4f2c1e0d6e1118fca063a81bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sun, 8 Nov 2015 16:01:12 +0100
Subject: [PATCH 212/216] FIX #3865 ajax_autocompleter triggers twice change()
 JS event over #search_htmlname

Close #3865
---
 htdocs/core/lib/ajax.lib.php              | 6 ------
 htdocs/core/tpl/objectline_create.tpl.php | 1 -
 2 files changed, 7 deletions(-)

diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index a4a94fe66c9..97ca06be08a 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -52,16 +52,13 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 					// 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("");
@@ -127,7 +124,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 						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) {
@@ -171,8 +167,6 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
 									}
     							});
     						}
-    						console.log("ajax_autocompleter new value selected, we trigger change");
-    						$("#search_'.$htmlname.'").trigger("change");	// To tell that input text field was modified
     					}
     					,delay: 500
 					}).data("ui-autocomplete")._renderItem = function( ul, item ) {
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index ee70101318b..c757efa23b4 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -523,7 +523,6 @@ jQuery(document).ready(function() {
 	/* When changing predefined product, we reload list of supplier prices */
 	$("#idprod, #idprodfournprice").change(function()
 	{
-		console.log("change #idprod, #idprodfournprice, conf->global->MARGIN_TYPE=<?php echo $conf->global->MARGIN_TYPE ?>");
 		setforpredef();
 		jQuery('#trlinefordates').show();
 

From f49fab8a7e8ae4d650037f882249b3a07452da25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Nov 2015 16:48:30 +0100
Subject: [PATCH 213/216] Rename some files in english and increase fields
 size.

---
 build/debian/README.howto                       |  6 +++---
 ...enerate-facture.php => generate-invoice.php} |  4 ++--
 ...generate-commande.php => generate-order.php} |  4 ++--
 ...enerate-produit.php => generate-product.php} |  4 ++--
 ...nerate-propale.php => generate-proposal.php} |  4 ++--
 ...rate-societe.php => generate-thirdparty.php} |  4 ++--
 dev/initdata/sftpget_and_loaddump.php           | 17 ++++++++++-------
 dev/skeletons/build_class_from_table.php        | 15 +++++++++++++--
 dev/skeletons/skeleton_card.php                 | 16 +++++++---------
 htdocs/install/mysql/migration/3.8.0-3.9.0.sql  |  1 +
 htdocs/install/mysql/tables/llx_user_param.sql  |  4 ++--
 11 files changed, 46 insertions(+), 33 deletions(-)
 rename dev/initdata/{generate-facture.php => generate-invoice.php} (95%)
 rename dev/initdata/{generate-commande.php => generate-order.php} (97%)
 rename dev/initdata/{generate-produit.php => generate-product.php} (96%)
 rename dev/initdata/{generate-propale.php => generate-proposal.php} (96%)
 rename dev/initdata/{generate-societe.php => generate-thirdparty.php} (97%)

diff --git a/build/debian/README.howto b/build/debian/README.howto
index 92397130a3a..1889c7b633e 100644
--- a/build/debian/README.howto
+++ b/build/debian/README.howto
@@ -239,7 +239,7 @@ http://packages.qa.debian.org/t/tcpdf.html
 
 ##### Create/Maintain dolibarr package
 
-To update dolibarr debian package when upstream version has changed
+To update dolibarr debian package when upstream (official version of external project) has changed:
 
 * You can git clone debian git repo
 > git clone git.debian.org:/git/collab-maint/dolibarr.git [dolibarr-debian]
@@ -284,10 +284,10 @@ Then check/modify also the user/date signature:
 - Name and email must match value into debian/control file (Entry added here is used by next step).
 
 
-To update dolibarr debian package when only files into debian has changed
+To update dolibarr debian package when only files into debian has changed, or if you include manually backport:
 
 * Change files and commit.
-* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2)
+* Add a tag debian/x.y.z+dfsgw-2 (increase the last 1 into 2, 3...)
 
 
 Once files has been prepared, it's time to test:
diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-invoice.php
similarity index 95%
rename from dev/initdata/generate-facture.php
rename to dev/initdata/generate-invoice.php
index 97f00f7d6d6..321cc6af06a 100755
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-invoice.php
@@ -19,8 +19,8 @@
  */
 
 /**
- *      \file       dev/intdata/generate-facture.php
- *		\brief      Script de generation de donnees aleatoires pour les factures
+ *      \file       dev/intdata/generate-invoice.php
+ *		\brief      Script example to inject random customer invoices (for load tests)
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-order.php
similarity index 97%
rename from dev/initdata/generate-commande.php
rename to dev/initdata/generate-order.php
index 785c0544876..6ba813c5135 100755
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-order.php
@@ -20,8 +20,8 @@
  */
 
 /**
- * 	    \file       dev/initdata/generate-commande.php
- * 		\brief      Script de generation de donnees aleatoires pour les commandes
+ * 	    \file       dev/initdata/generate-order.php
+ * 		\brief      Script example to inject random orders (for load tests)
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-product.php
similarity index 96%
rename from dev/initdata/generate-produit.php
rename to dev/initdata/generate-product.php
index 6e7ea6dd05f..38c0e755db3 100755
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-product.php
@@ -20,8 +20,8 @@
  */
 
 /**
- *      \file       dev/initdata/generate-produit.php
- *		\brief      Script de generation de donnees aleatoires pour les produits
+ *      \file       dev/initdata/generate-product.php
+ *		\brief      Script example to inject random products (for load tests)
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-proposal.php
similarity index 96%
rename from dev/initdata/generate-propale.php
rename to dev/initdata/generate-proposal.php
index b7b76ec2c02..8e17e673b86 100755
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-proposal.php
@@ -20,8 +20,8 @@
  */
 
 /**
- *	    \file       dev/initdata/generate-propale.php
- *		\brief      Script de generation de donnees aleatoires pour les propales
+ *	    \file       dev/initdata/generate-proposal.php
+ *		\brief      Script example to inject random proposals (for load tests)
  */
 
 // Test si mode batch
diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-thirdparty.php
similarity index 97%
rename from dev/initdata/generate-societe.php
rename to dev/initdata/generate-thirdparty.php
index 72e4d9b1e84..9d928db6ac0 100755
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-thirdparty.php
@@ -20,8 +20,8 @@
  */
 
 /**
- *      \file       dev/initdata/generate-societe.php
- *      \brief      Script de generation de donnees aleatoires pour les societes
+ *      \file       dev/initdata/generate-thirdparty.php
+ *      \brief      Script example to inject random thirdparties (for load tests)
  */
 
 // Test si mode batch
diff --git a/dev/initdata/sftpget_and_loaddump.php b/dev/initdata/sftpget_and_loaddump.php
index c91ddcc3e17..72a33cf197c 100755
--- a/dev/initdata/sftpget_and_loaddump.php
+++ b/dev/initdata/sftpget_and_loaddump.php
@@ -15,6 +15,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/
+ * 
+ * Get a distant dump file and load it into a mysql database
  */
 
 $sapi_type = php_sapi_name();
@@ -32,9 +34,10 @@ $error=0;
 
 $sourceserver=isset($argv[1])?$argv[1]:'';		// user@server:/src/file
 $password=isset($argv[2])?$argv[2]:'';
-$database=isset($argv[3])?$argv[3]:'';
-$loginbase=isset($argv[4])?$argv[4]:'';
-$passwordbase=isset($argv[5])?$argv[5]:'';
+$dataserver=isset($argv[3])?$argv[3]:'';
+$database=isset($argv[4])?$argv[4]:'';
+$loginbase=isset($argv[5])?$argv[5]:'';
+$passwordbase=isset($argv[6])?$argv[6]:'';
 
 // Include Dolibarr environment
 $res=0;
@@ -64,7 +67,7 @@ if (preg_match('/^(.*)@(.*):(.*)$/',$sourceserver,$reg))
 }
 if (empty($sourceserver) || empty($server) || empty($login) || empty($sourcefile) || empty($password) || empty($database) || empty($loginbase) || empty($passwordbase))
 {
-	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh database loginbase passbase\n";
+	print "Usage: $script_file login@server:/src/file.(sql|gz|bz2) passssh databaseserver databasename loginbase passbase\n";
 	print "Return code: 0 if success, <>0 if error\n";
 	print "Warning, this script may take a long time.\n";
 	exit(-1);
@@ -108,14 +111,14 @@ if ($connection)
 		print 'Get file '.$sourcefile.' into '.$targetdir.$targetfile."\n";
 		ssh2_scp_recv($connection, $sourcefile, $targetdir.$targetfile);
 
-		$fullcommand="cat ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
+		$fullcommand="cat ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		if (preg_match('/\.bz2$/',$targetfile))
 		{
-			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand="bzip2 -c -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		if (preg_match('/\.gz$/',$targetfile))
 		{
-			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -u".$loginbase." -p".$passwordbase." -D ".$database;
+			$fullcommand="gzip -d ".$targetdir.$targetfile." | mysql -h".$databaseserver." -u".$loginbase." -p".$passwordbase." -D ".$database;
 		}
 		print "Load dump with ".$fullcommand."\n";
 		$output=array();
diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php
index 6025f6a1f4e..803a6c8b8f5 100755
--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -619,17 +619,28 @@ foreach ($skeletonfiles as $skeletonfile => $outfile)
     $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 and EDIT - List of td for card view 
+    // 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=\"'.\$".$prop['field'].".'\"></td></tr>';\n";
+    	    $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'])
+    	{
+    	    $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";
+    	}
+    }
     $targetcontent=preg_replace('/LIST_OF_TD_LABEL_FIELDS_EDIT/', $varprop, $targetcontent);
     
     // LIST_OF_TD_LABEL_FIELDS_VIEW - List of td for card view 
diff --git a/dev/skeletons/skeleton_card.php b/dev/skeletons/skeleton_card.php
index 22958c9c833..a85969c53ad 100644
--- a/dev/skeletons/skeleton_card.php
+++ b/dev/skeletons/skeleton_card.php
@@ -281,12 +281,17 @@ if (($id || $ref) && $action == 'edit')
 
 
 // Part to show record
-if ($id && (empty($action) || $action == 'view'))
+if ($id && (empty($action) || $action == 'view' || $action == 'delete'))
 {
 	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><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
 	// LIST_OF_TD_LABEL_FIELDS_VIEW
@@ -310,14 +315,7 @@ if ($id && (empty($action) || $action == 'view'))
 
 		if ($user->rights->mymodule->delete)
 		{
-			if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with 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"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
-			}
+			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";
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index 8a00cffb811..e474e1dbfda 100755
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -65,6 +65,7 @@ ALTER TABLE llx_paiement ADD COLUMN ref varchar(30) NOT NULL DEFAULT '' AFTER ro
 
 ALTER TABLE llx_socpeople ADD COLUMN photo varchar(255) AFTER skype;
 
+ALTER TABLE llx_user_param MODIFY COLUMN param varchar(255) NOT NULL DEFAULT '';
 ALTER TABLE llx_user_param MODIFY COLUMN value text NOT NULL DEFAULT '';
 
 ALTER TABLE llx_expedition ADD COLUMN import_key varchar(14);
diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql
index 7194d73b4c4..67bce42645a 100644
--- a/htdocs/install/mysql/tables/llx_user_param.sql
+++ b/htdocs/install/mysql/tables/llx_user_param.sql
@@ -22,7 +22,7 @@ create table llx_user_param
 (
   fk_user       integer      NOT NULL,
   entity        integer DEFAULT 1 NOT NULL,	-- multi company id
-  param         varchar(64)  NOT NULL,
+  param         varchar(255)  NOT NULL,
   value         text NOT NULL
 )ENGINE=innodb;
 
@@ -32,4 +32,4 @@ create table llx_user_param
 -- 1 : first company param
 -- 2 : second company param
 -- 3 : etc...
---
\ No newline at end of file
+--

From 13a0fa2c690722676f00e1c89d3a42da38d7f67d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Nov 2015 15:50:13 +0100
Subject: [PATCH 214/216] Missing css

---
 htdocs/user/card.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 42e1617e4c1..e1329a591be 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -697,7 +697,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<tr>';
 
     // Lastname
-    print '<td width="160"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
+    print '<td class="titlefield"><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td>';
     print '<td>';
     if (! empty($ldap_lastname))
     {
@@ -1168,7 +1168,7 @@ else
 	        print '<table class="border tableforfield" width="100%">';
 
             // Login
-            print '<tr><td>'.$langs->trans("Login").'</td>';
+            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>';
@@ -1362,7 +1362,7 @@ else
 	        print '<div class="underbanner clearboth"></div>';
 	        print '<table class="border tableforfield" width="100%">';
 
-        	print '<tr><td>'.$langs->trans("LastConnexion").'</td>';
+        	print '<tr><td class="titlefield">'.$langs->trans("LastConnexion").'</td>';
             print '<td>'.dol_print_date($object->datelastlogin,"dayhour").'</td>';
             print "</tr>\n";
 

From e1b329e80a8c52bd07be5f161d1e6f6ad1c6aaa2 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 11 Nov 2015 08:16:06 +0100
Subject: [PATCH 215/216] HRM: Update work

---
 htdocs/hrm/admin/admin_establishment.php | 79 +++++++++++++-------
 htdocs/hrm/class/employee.class.php      | 37 +++++++---
 htdocs/hrm/class/establishment.class.php | 74 ++++++++++++++-----
 htdocs/hrm/employee/list.php             |  4 +-
 htdocs/hrm/establishment/card.php        | 91 ++++++++++--------------
 htdocs/hrm/establishment/info.php        |  1 +
 6 files changed, 174 insertions(+), 112 deletions(-)

diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index 771f2e243bc..26e11dd6b94 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -33,9 +33,13 @@ if (! $user->admin)
 
 $error=0;
 
-$action = GETPOST('action', 'alpha');
-
-$object = new Establishment($db);
+// List of statut
+static $tmpstatus2label=array(
+		'0'=>'OpenEtablishment',
+		'1'=>'CloseEtablishment'
+);
+$status2label=array('');
+foreach ($tmpstatus2label as $key => $val) $status2label[$key]=$langs->trans($val);
 
 /*
  * Actions
@@ -44,10 +48,24 @@ $object = new Establishment($db);
 /*
  * View
  */
-$page_name = "Establishments";
-llxHeader('', $langs->trans($page_name));
+llxHeader('', $langs->trans("Establishments"));
+
+$sortorder     = GETPOST("sortorder");
+$sortfield     = GETPOST("sortfield");
+if (!$sortorder) $sortorder="DESC";
+if (!$sortfield) $sortfield="e.rowid";
+
+if ($page == -1) {
+	$page = 0 ;
+}
+
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = $conf->liste_limit;
 
 $form = new Form($db);
+$establishmenttmp=new Establishment($db);
 
 dol_htmloutput_mesg($mesg);
 
@@ -62,43 +80,50 @@ dol_fiche_head($head, 'establishments', $langs->trans("HRM"), 0, "user");
 $sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status";
 $sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
 $sql.= " WHERE e.entity = ".$conf->entity;
+$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->plimit($limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result)
 {
-	$var=false;
-    $num = $db->num_rows($result);
-
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
 	// Load attribute_label
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td>'.$langs->trans("Ref").'</td>';
-	print '<td>'.$langs->trans("Name").'</td>';
-	print '<td>'.$langs->trans("Address").'</td>';
-	print '<td>'.$langs->trans("Zipcode").'</td>';
-	print '<td>'.$langs->trans("Town").'</td>';
-	print '<td align="right">'.$langs->trans("Status").'</td>';
-	print '</tr>';
+	print "<tr class=\"liste_titre\">";
+	print_liste_field_titre($langs->trans("Name"),$_SERVER["PHP_SELF"],"e.name","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Address"),$_SERVER["PHP_SELF"],"e.address","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Zipcode"),$_SERVER["PHP_SELF"],"e.zip","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"e.town","","","",$sortfield,$sortorder);
+	print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"e.status","","",'align="right"',$sortfield,$sortorder);
+	print "</tr>\n";
 
-	if ($num)
+	$var=true;
+
+	if ($num > 0)
     {
 	    $establishmentstatic=new Establishment($db);
 
-		while ($i < $num && $i < $max)
-        {
+		while ($i < min($num,$limit))
+		{
             $obj = $db->fetch_object($result);
-            $fiscalyearstatic->id=$obj->rowid;
-            print '<tr '.$bc[$var].'>';
-			print '<td><a href="admin_establishment_card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEstablishment"),"building").' '.$obj->rowid.'</a></td>';
-            print '<td align="left">'.$obj->name.'</td>';
+            
+			$establishmentstatic->id=$obj->rowid;
+			$establishmentstatic->name=$obj->name;
+
+			$var=!$var;
+			print '<tr '.$bc[$var].'>';
+			print '<td>'.$establishmentstatic->getNomUrl(1).'</td>';
             print '<td align="left">'.$obj->address.'</td>';
 			print '<td align="left">'.$obj->zip.'</td>';
 			print '<td align="left">'.$obj->town.'</td>';
-            print '<td align="right">'.$establishmentstatic->LibStatut($obj->status,5).'</td>';
-            print '</tr>';
-            $var=!$var;
+
+            print '<td align="right">';
+			print $establishmenttmp->getLibStatus(5);
+			print '</td>';
+            print "</tr>\n";
+
             $i++;
         }
 
diff --git a/htdocs/hrm/class/employee.class.php b/htdocs/hrm/class/employee.class.php
index 4014bb717f2..1a1350b3b63 100644
--- a/htdocs/hrm/class/employee.class.php
+++ b/htdocs/hrm/class/employee.class.php
@@ -67,26 +67,41 @@ class Employee extends CommonObject
 	 * @param	int		$id		Id of record to load
 	 * @return	int				<0 if KO, >0 if OK
 	 */
-	function fetch($id)
+	function fetch($id='')
 	{
-		$sql = "SELECT rowid, firstname, lastname, status, fk_user";
-		$sql.= " FROM ".MAIN_DB_PREFIX."user";
+		global $conf, $user;
+
+		$sql = "SELECT e.rowid, e.firstname, e.lastname, e.gender, e.email, e.statut, e.entity, e.fk_user";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as e";
 		$sql.= " WHERE rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ( $result )
+		if ($result)
 		{
 			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$this->id			= $obj->rowid;
+				$this->lastname		= $obj->lastname;
+				$this->firstname 	= $obj->firstname;
+				$this->gender       = $obj->gender;
+				$this->address		= $obj->address;
+				$this->zip			= $obj->zip;
+				$this->town			= $obj->town;
+				$this->statut		= $obj->statut;
+				$this->photo		= $obj->photo;
 
-			$this->id			= $obj->rowid;
-			$this->name			= $obj->name;
-			$this->address		= $obj->address;
-			$this->zip			= $obj->zip;
-			$this->town			= $obj->town;
-			$this->status	    = $obj->status;
+				$this->db->free($result);
+			}
+			else
+			{
+				$this->error="EMPLOYEENOTFOUND";
+				dol_syslog(get_class($this)."::fetch user not found", LOG_DEBUG);
 
-			return 1;
+				$this->db->free($result);
+				return 0;
+			}
 		}
 		else
 		{
diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index c5ba77fd547..ac1752266c3 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -34,6 +34,7 @@ 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;
 
 	var $name;
@@ -43,6 +44,8 @@ class Establishment extends CommonObject
 	var $status;		// 0=open, 1=closed
 	var $entity;
 
+	var $country_id;
+
 	var $statuts=array();
 	var $statuts_short=array();
 
@@ -69,12 +72,18 @@ class Establishment extends CommonObject
 	 */
 	function create($user)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$error = 0;
-
+		$ret = 0;
 		$now=dol_now();
 
+        // Clean parameters
+        $this->address=($this->address>0?$this->address:$this->address);
+        $this->zip=($this->zip>0?$this->zip:$this->zip);
+        $this->town=($this->town>0?$this->town:$this->town);
+        $this->country_id=($this->country_id>0?$this->country_id:$this->country_id);
+
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."establishment (";
@@ -83,22 +92,22 @@ class Establishment extends CommonObject
 		$sql.= ", zip";
 		$sql.= ", town";
 		$sql.= ", status";
+		$sql.= ", fk_country";
 		$sql.= ", entity";
 		$sql.= ", datec";
 		$sql.= ", fk_user_author";
 		$sql.= ") VALUES (";
-		$sql.= " '".$this->name."'";
-		$sql.= ", '".$this->address."'";
-		$sql.= ", '".$this->zip."'";
-		$sql.= ", '".$this->town."'";
+		$sql.= " '".$this->db->escape($this->name)."'";
+		$sql.= ", '".$this->db->escape($this->address)."'";
+        $sql.= ", '".$this->db->escape($this->zip)."'";
+        $sql.= ", '".$this->db->escape($this->town)."'";
+		$sql.= ", ".$this->country_id;
 		$sql.= ", ".$this->status;
 		$sql.= ", ".$conf->entity;
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ". $user->id;
 		$sql.= ")";
 
-		$this->db->begin();
-
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (! $resql) {
@@ -148,6 +157,7 @@ class Establishment extends CommonObject
 		$sql .= ", address = '".$this->address."'";
 		$sql .= ", zip = '".$this->zip."'";
 		$sql .= ", town = '".$this->town."'";
+		
 		$sql .= ", status = '".$this->status."'";
 		$sql .= ", fk_user_mod = " . $user->id;
 		$sql .= " WHERE rowid = ".$this->id;
@@ -257,23 +267,23 @@ class Establishment extends CommonObject
 		}
 		if ($mode == 2)
 		{
-			if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts_short[$status]);
-			if ($status==1) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts_short[$status]);
+			if ($status==0) return img_picto($langs->trans($this->statuts_short[$status]),'statut4').' '.$langs->trans($this->statuts_short[$status]);
+			if ($status==1) return img_picto($langs->trans($this->statuts_short[$status]),'statut8').' '.$langs->trans($this->statuts_short[$status]);
 		}
 		if ($mode == 3)
 		{
-			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4');
-			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8');
+			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut4');
+			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut8');
 		}
 		if ($mode == 4)
 		{
-			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status4').' '.$langs->trans($this->statuts[$status]);
-			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'status8').' '.$langs->trans($this->statuts[$status]);
+			if ($status==0 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut4').' '.$langs->trans($this->statuts[$status]);
+			if ($status==1 && ! empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]),'statut8').' '.$langs->trans($this->statuts[$status]);
 		}
 		if ($mode == 5)
 		{
-			if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status4');
-			if ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'status8');
+			if ($status==0 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut4');
+			if ($status==1 && ! empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]),'statut8');
 		}
 	}
 
@@ -298,20 +308,22 @@ class Establishment extends CommonObject
 			{
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
 				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)
+				if ($obj->fk_user_mod)
 				{
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_mod);
 					$this->user_modification = $muser;
+
+					$this->date_modification = $this->db->jdate($obj->tms);
 				}
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->tms);
 			}
 			$this->db->free($result);
 		}
@@ -321,4 +333,28 @@ class Establishment extends CommonObject
 		}
 	}
 
+    /**
+     *  Return clicable name (with picto eventually)
+     *
+     *  @param      int     $withpicto      0=No picto, 1=Include picto into link, 2=Only picto
+     *  @return     string                  String with URL
+     */
+    function getNomUrl($withpicto=0)
+    {
+        global $langs;
+
+        $result='';
+
+        $link = '<a href="'.DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$this->id.'">';
+        $linkend='</a>';
+
+        $picto='building';
+
+        $label=$langs->trans("Show").': '.$this->name;
+
+        if ($withpicto) $result.=($link.img_object($label,$picto).$linkend);
+        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto != 2) $result.=$link.$this->name.$linkend;
+        return $result;
+    }
 }
diff --git a/htdocs/hrm/employee/list.php b/htdocs/hrm/employee/list.php
index 1635ba41cda..46c59e90937 100644
--- a/htdocs/hrm/employee/list.php
+++ b/htdocs/hrm/employee/list.php
@@ -169,8 +169,8 @@ if ($result)
 	    $employeestatic->email=$obj->email;
 	    $employeestatic->gender=$obj->gender;
 	    $employeestatic->societe_id=$obj->fk_soc;
-	    $employeestatic->firstname='';
-		$employeestatic->lastname=$obj->login;
+	    $userstatic->firstname=$obj->firstname;
+		$userstatic->lastname=$obj->lastname;
 
 		$li=$employeestatic->getNomUrl(1,'',0,0,24,1);
 
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 533ad5117ff..b63e4e09592 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -81,34 +81,29 @@ else if ($action == 'add')
 
         if (empty($error))
         {
-			$tmparray=getCountry(GETPOST('country_id','int'),'all',$db,$langs,0);
-			if (! empty($tmparray['id']))
-			{
-				$object->country_id   =$tmparray['id'];
-				$object->country_code =$tmparray['code'];
-				$object->country_label=$tmparray['label'];
-			}
-
 			$object->address 		= GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
-			$object->fk_pays		= $object->country_id;
+			$object->country_id		= GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
+			$object->country_id		= $object->country_id?$object->country_id:$mysoc->country_id;
+			$object->country_id 	= $_POST["country_id"];
 			$object->status     	= GETPOST('status','int');
 			$object->fk_user_author	= $user->id;
 			$object->datec			= dol_now();
 
+			
+
 			$id = $object->create($user);
 
             if ($id > 0)
             {
                 header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
                 exit;
-            }
-            else
-            {
-	            setEventMessage($object->error, 'errors');
-                $action='create';
-            }
+			}
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
         }
         else
         {
@@ -131,12 +126,7 @@ else if ($action == 'update')
 
 		$name = GETPOST('name', 'alpha');
 		if (empty($name)) {
-			setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('NameProperty')), 'errors');
-			$error ++;
-		}
-		$typeid = GETPOST('typeid', 'int');
-		if (empty($typeid)) {
-			setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('TypeProperty')), 'errors');
+			setEventMessage($langs->trans('ErrorFieldRequired', $langs->trans('Name')), 'errors');
 			$error ++;
 		}
 
@@ -145,25 +135,23 @@ else if ($action == 'update')
 			$object->address 		= GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
-			$object->fk_pays		= GETPOST('country_id', 'int');
-			$object->rowid 			= GETPOST('id');
+			$object->country_id     = GETPOST('country_id', 'int');
 			$object->fk_user_mod	= $user->id;
 
-			$id = $object->update();
+			$result = $object->update();
 
-            if ($id > 0)
+            if ($result > 0)
             {
-                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $_POST['id']);
                 exit;
             }
-            else
-            {
-	            setEventMessage($object->error, 'errors');
-                $action='create';
-            }
+			else
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
 	} else {
-        header("Location: card.php?id=" . $id);
+        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $_POST['id']);
         exit;
 	}
 }
@@ -193,11 +181,11 @@ if ($action == 'create')
     print '<table class="border" width="100%">';
 
 	// Name
-    print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("Name").'</label></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") . '"></td></tr>';
 
 	// Address
 	print '<tr>';
-	print '<td><label for="address">' . $langs->trans("Address") . '</label></td>';
+	print '<td>'.fieldLabel('Address','address',0).'</td>';
 	print '<td>';
 	print '<input name="address" id="address" size="32" value="' . $object->address . '">';
 	print '</td>';
@@ -205,7 +193,7 @@ if ($action == 'create')
 
 	// Zipcode
 	print '<tr>';
-	print '<td><label for="zipcode">' . $langs->trans('Zip') . '</label></td>';
+	print '<td>'.fieldLabel('Zip','zipcode',0).'</td>';
 	print '<td>';
 	print $formcompany->select_ziptown(GETPOST('zipcode', 'alpha'), 'zipcode', array (
 			'town',
@@ -216,7 +204,7 @@ if ($action == 'create')
 	
 	// Town
 	print '<tr>';
-	print '<td><label for="town">' . $langs->trans('Town') . '</label></td>';
+	print '<td>'.fieldLabel('Town','town',0).'</td>';
 	print '<td>';
 	print $formcompany->select_ziptown(GETPOST('town', 'alpha'), 'town', array (
 			'zipcode',
@@ -227,7 +215,7 @@ if ($action == 'create')
 
 	// Country
 	print '<tr>';
-	print '<td><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td>';
+	print '<td>'.fieldLabel('Country','selectcountry_id',0).'</td>';
 	print '<td class="maxwidthonsmartphone">';
 	print $form->select_country($mysoc->country_id,'country_id');
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
@@ -236,7 +224,7 @@ if ($action == 'create')
 
 	// Status
     print '<tr>';
-    print '<td class="fieldrequired"><label for="status">'.$langs->trans("Status").'</label></td>';
+    print '<td>'.fieldLabel('Status','status',1).'</td>';
 	print '<td>';
 	print $form->selectarray('status',$status2label,GETPOST('status'));
     print '</td></tr>';
@@ -273,46 +261,43 @@ else if ($id)
 
             // Ref
             print "<tr>";
-            print '<td width="20%">'.$langs->trans("Ref").'</td><td>';
-            print $object->rowid;
+            print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
+            print $object->id;
             print '</td></tr>';
 
             // Name
-            print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("Name").'</label></td><td>';
+            print '<tr><td>'.fieldLabel('Name','name',1).'</td><td>';
             print '<input name="name" id="name" class="flat" size="32" value="'.$object->name.'">';
             print '</td></tr>';
 
 			// Address
-			print '<tr>';
-			print '<td><label for="address">' . $langs->trans("Address") . '</label></td>';
+			print '<tr><td>'.fieldLabel('Address','address',0).'</td>';
 			print '<td>';
 			print '<input name="address" id="address" size="32" value="' . $object->address . '">';
-			print '</td>';
-			print '</tr>';
+			print '</td></tr>';
 
 			// Zipcode / Town
-			print '<tr><td><label for="zipcode">' . $langs->trans('Zip') . '</label></td><td>';
+			print '<tr><td>'.fieldLabel('Zip','zipcode',0).'</td><td>';
 			print $formcompany->select_ziptown($object->zip, 'zipcode', array (
 					'town',
 					'selectcountry_id' 
 			), 6) . '</tr>';
-			print '<tr><td><label for="town">' . $langs->trans('Town') . '</label></td><td>';
+			print '<tr><td>'.fieldLabel('Town','town',0).'</td><td>';
 			print $formcompany->select_ziptown($object->town, 'town', array (
 					'zipcode',
 					'selectcountry_id' 
 			)) . '</td></tr>';
 
 			// Country
-			print '<tr>';
-			print '<td><label for="selectcountry_id">' . $langs->trans("Country") . '</label></td>';
+			print '<tr><td>'.fieldLabel('Country','selectcountry_id',0).'</td>';
 			print '<td class="maxwidthonsmartphone">';
-			print $form->select_country($object->fk_pays,'country_id');
+			print $form->select_country($object->fk_country,'country_id');
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 			print '</td>';
 			print '</tr>';			
 
 			// Status
-			print '<tr><td><label for="status">'.$langs->trans("Status").'</label></td><td>';
+			print '<tr><td>'.fieldLabel('Status','status',1).'</td><td>';
 			print $form->selectarray('status',$status2label,$object->status);
 			print '</td></tr>';
 
@@ -347,7 +332,7 @@ else if ($id)
 
             // Ref
             print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td width="50%">';
-            print $object->rowid;
+            print $object->id;
 			print '</td><td width="25%">';
 			print $linkback;
             print '</td></tr>';
@@ -379,7 +364,7 @@ else if ($id)
 			// Country
 			print '<tr>';
 			print '<td>'.$langs->trans("Country").'</td>';
-			print '<td colspan="2">'.getCountry($object->fk_pays,1).'</td>';
+			print '<td colspan="2">'.getCountry($object->fk_country,1).'</td>';
 			print '</tr>';
 
             // Status
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 2bf014481ac..806bd893fbb 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -22,6 +22,7 @@
 
 require('../../main.inc.php');
 require_once DOL_DOCUMENT_ROOT.'/core/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/hrm/class/establishment.class.php';
 
 $langs->load("admin");

From e157d8b8d20831eb2b1409a2a93f935b43db376a Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Wed, 11 Nov 2015 08:52:28 +0100
Subject: [PATCH 216/216] Update for fk_country

---
 htdocs/hrm/class/establishment.class.php | 30 +++++++++++++++++++++---
 htdocs/hrm/establishment/card.php        | 15 ++++++++----
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/htdocs/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index ac1752266c3..88b765740ef 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -182,9 +182,11 @@ class Establishment extends CommonObject
 	*/
 	function fetch($id)
 	{
-		$sql = "SELECT rowid, name, address, zip, town, status";
-		$sql.= " FROM ".MAIN_DB_PREFIX."establishment";
-		$sql.= " WHERE rowid = ".$id;
+		$sql = "SELECT e.rowid, e.name, e.address, e.zip, e.town, e.status, e.fk_country as country_id,";
+		$sql.= ' c.code as country_code, c.label as country';
+		$sql.= " FROM ".MAIN_DB_PREFIX."establishment as e";
+        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON e.fk_country = c.rowid';
+		$sql.= " WHERE e.rowid = ".$id;
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -199,6 +201,10 @@ class Establishment extends CommonObject
 			$this->town			= $obj->town;
 			$this->status	    = $obj->status;
 
+            $this->country_id   = $obj->country_id;
+            $this->country_code = $obj->country_code;
+            $this->country      = $obj->country;			
+
 			return 1;
 		}
 		else
@@ -357,4 +363,22 @@ class Establishment extends CommonObject
         if ($withpicto != 2) $result.=$link.$this->name.$linkend;
         return $result;
     }
+
+	/**
+     * 	Return account country code
+     *
+     *	@return		string		country code
+     */
+    function getCountryCode()
+    {
+        global $mysoc;
+
+        // We return country code of bank account
+        if (! empty($this->country_code)) return $this->country_code;
+
+        // We return country code of managed company
+        if (! empty($mysoc->country_code)) return $mysoc->country_code;
+
+        return '';
+    }
 }
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index b63e4e09592..10a1b42e961 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -84,9 +84,7 @@ else if ($action == 'add')
 			$object->address 		= GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
-			$object->country_id		= GETPOST('country_id','int')?GETPOST('country_id','int'):$mysoc->country_id;
-			$object->country_id		= $object->country_id?$object->country_id:$mysoc->country_id;
-			$object->country_id 	= $_POST["country_id"];
+			$object->country_id     = $_POST["country_id"];
 			$object->status     	= GETPOST('status','int');
 			$object->fk_user_author	= $user->id;
 			$object->datec			= dol_now();
@@ -135,7 +133,7 @@ else if ($action == 'update')
 			$object->address 		= GETPOST('address', 'alpha');
 			$object->zip 			= GETPOST('zipcode', 'alpha');
 			$object->town			= GETPOST('town', 'alpha');
-			$object->country_id     = GETPOST('country_id', 'int');
+			$object->country_id     = $_POST["country_id"];
 			$object->fk_user_mod	= $user->id;
 
 			$result = $object->update();
@@ -364,7 +362,14 @@ else if ($id)
 			// Country
 			print '<tr>';
 			print '<td>'.$langs->trans("Country").'</td>';
-			print '<td colspan="2">'.getCountry($object->fk_country,1).'</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